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

networks.txt: remove TFI (Ireland)

Browse source
This commit is contained in:
Andreas Schildbach 2023-11-05 21:40:22 +01:00
parent dc5c69d9ec
commit 1eda102dc0
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

@ -83,9 +83,6 @@ FINLAND|fi-FI|FI;Helsinki|beta
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
# IE
TFI|ga-IE|IE;Dublin;GB;Belfast
# AE
DUB|ae-AE|AE;Dubai|beta

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

@ -109,8 +109,6 @@
<string name="network_tlem_comment">Lokal- und Regionalverkehr (z.B. London, Birmingham)</string>
<string name="network_mersey_label">Liverpool</string>
<string name="network_mersey_comment">Lokal- und Regionalverkehr</string>
<string name="network_tfi_label">Irland &amp; Nordirland</string>
<string name="network_tfi_comment">Lokal- und Regionalverkehr</string>
<string name="network_dub_label">Dubai</string>
<string name="network_dub_comment">Lokalverkehr</string>
<string name="network_bart_label">San Francisco</string>

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

@ -109,8 +109,6 @@
<string name="network_tlem_comment">local and regional (e.g. London, Birmingham)</string>
<string name="network_mersey_label">Liverpool</string>
<string name="network_mersey_comment">local and regional</string>
<string name="network_tfi_label">Ireland &amp; Northern Ireland</string>
<string name="network_tfi_comment">local and regional</string>
<string name="network_dub_label">Dubai</string>
<string name="network_dub_comment">local</string>
<string name="network_bart_label">San Francisco</string>

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

@ -109,6 +109,12 @@ public class Application extends android.app.Application {
FavoriteStationsProvider.migrateFavoriteStations(this, VMS, NetworkId.VVO);
QueryHistoryProvider.migrateQueryHistory(this, VMS, NetworkId.VVO);
// 2023-11-05: migrate TFI to use RT
final String TFI = "TFI";
migrateSelectedNetwork(TFI, NetworkId.RT);
FavoriteStationsProvider.deleteFavoriteStations(this, TFI);
QueryHistoryProvider.deleteQueryHistory(this, TFI);
log.info("Migrations took {}", watch);
}

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

@ -59,7 +59,6 @@ import de.schildbach.pte.SncbProvider;
import de.schildbach.pte.SpainProvider;
import de.schildbach.pte.StvProvider;
import de.schildbach.pte.SydneyProvider;
import de.schildbach.pte.TfiProvider;
import de.schildbach.pte.TlemProvider;
import de.schildbach.pte.VbbProvider;
import de.schildbach.pte.VblProvider;
@ -200,8 +199,6 @@ public final class NetworkProviderFactory {
return new TlemProvider();
else if (networkId.equals(NetworkId.MERSEY))
return new MerseyProvider();
else if (networkId.equals(NetworkId.TFI))
return new TfiProvider();
else if (networkId.equals(NetworkId.DUB))
return new DubProvider();
else if (networkId.equals(NetworkId.BART))