mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-06 09:28:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

networks.txt: remove Finland

Browse source
This commit is contained in:
Andreas Schildbach 2024-08-09 12:27:25 +02:00
parent 100fb5ab3a
commit e66388c60d
5 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
oeffi/assets/networks.txt
View file

@ -73,9 +73,6 @@ DSB|da-DK|DK;København
# SE
SE|sv-SE|SE;Stockholm
# FI
FINLAND|fi-FI|FI;Helsinki|beta
# GB
TLEM|en-UK|GB;Greater London;Derbyshire;Leicestershire;Rutland;Northamptonshire;Nottinghamshire;Lincolnshire;Berkshire;Buckinghamshire;East Sussex;Hampshire;Isle of Wight;Kent;Oxfordshire;Surrey;West Sussex;Essex;Hertfordshire;Bedfordshire;Cambridgeshire;Norfolk;Suffolk;Somerset;Gloucestershire;Wiltshire;Dorset;Devon;Cornwall;West Devon;Stowford;Eastleigh;Swindon;Gloucester;Plymouth;Torbay;Bournemouth;Poole;Birmingham
MERSEY|en-UK|GB;Liverpool|beta

2
oeffi/res/values-de/networks.xml
View file

@ -101,8 +101,6 @@
<string name="network_dsb_comment">Fern-, Regional und Lokalverkehr (z.B. Kopenhagen)</string>
<string name="network_se_label">Schweden</string>
<string name="network_se_comment">Fern-, Regional und Lokalverkehr (z.B. Stockholm)</string>
<string name="network_finland_label">Finnland</string>
<string name="network_finland_comment">Fern-, Regional und Lokalverkehr (z.B. Helsinki)</string>
<string name="network_tlem_label">England, Schottland &amp; Wales.</string>
<string name="network_tlem_comment">Lokal- und Regionalverkehr (z.B. London, Birmingham)</string>
<string name="network_mersey_label">Liverpool</string>

2
oeffi/res/values/networks.xml
View file

@ -101,8 +101,6 @@
<string name="network_dsb_comment">long-distance, regional and local (e.g. Copenhagen)</string>
<string name="network_se_label">Sweden</string>
<string name="network_se_comment">long-distance, regional and local (e.g. Stockholm)</string>
<string name="network_finland_label">Finland</string>
<string name="network_finland_comment">long-distance, regional and local (e.g. Helsinki)</string>
<string name="network_tlem_label">England, Scotland &amp; Wales</string>
<string name="network_tlem_comment">local and regional (e.g. London, Birmingham)</string>
<string name="network_mersey_label">Liverpool</string>

6
oeffi/src/de/schildbach/oeffi/Application.java
View file

@ -119,6 +119,12 @@ public class Application extends android.app.Application {
FavoriteStationsProvider.migrateFavoriteStationIds(this, NetworkId.MVV, "0", "10000", 91000000);
QueryHistoryProvider.migrateQueryHistoryIds(this, NetworkId.MVV, "0", "10000", 91000000);
// 2024-08-09: migrate Finland to use RT
final String FINLAND = "FINLAND";
migrateSelectedNetwork(FINLAND, NetworkId.RT);
FavoriteStationsProvider.deleteFavoriteStations(this, FINLAND);
QueryHistoryProvider.deleteQueryHistory(this, FINLAND);
log.info("Migrations took {}", watch);
}

3
oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
View file

@ -32,7 +32,6 @@ import de.schildbach.pte.DbProvider;
import de.schildbach.pte.DingProvider;
import de.schildbach.pte.DsbProvider;
import de.schildbach.pte.DubProvider;
import de.schildbach.pte.FinlandProvider;
import de.schildbach.pte.GvhProvider;
import de.schildbach.pte.InvgProvider;
import de.schildbach.pte.ItalyProvider;
@ -190,8 +189,6 @@ public final class NetworkProviderFactory {
return new DsbProvider("{\"type\":\"AID\",\"aid\":\"irkmpm9mdznstenr-android\"}");
else if (networkId.equals(NetworkId.SE))
return new SeProvider("{\"type\":\"AID\",\"aid\":\"h5o3n7f4t2m8l9x1\"}");
else if (networkId.equals(NetworkId.FINLAND))
return new FinlandProvider(NAVITIA_AUTHORIZATION);
else if (networkId.equals(NetworkId.TLEM))
return new TlemProvider();
else if (networkId.equals(NetworkId.MERSEY))