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

Adapt to: NRI: Remove provider for Norway.

Browse source
This commit is contained in:
Andreas Schildbach 2018-11-05 15:18:52 +01:00
parent 84b6920c06
commit e477e97480
5 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
oeffi/assets/networks.txt
View file

@ -72,9 +72,6 @@ DSB|da-DK|DK;København
# SE
SE|sv-SE|SE;Stockholm
# NO
NRI|no-NO|NO;Oslo;Bergen
# 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_nri_label">Norwegen</string>
<string name="network_nri_comment">Fern-, Regional und Lokalverkehr (z.B. Oslo, Bergen)</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

@ -102,8 +102,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_nri_label">Norway</string>
<string name="network_nri_comment">long-distance, regional and local (e.g. Oslo, Bergen)</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>

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

@ -108,10 +108,6 @@ public class Application extends android.app.Application {
migrateSelectedNetwork(PACA, NetworkId.RT);
Downloader.deleteDownload(new File(getFilesDir(), PACA.toLowerCase(Locale.ENGLISH) + ".db"));
// 2017-05-28: clean up NRI, remove IDs less than 9 digits
FavoriteStationsProvider.deleteFavoriteStations(this, NetworkId.NRI, "1", "100000000");
QueryHistoryProvider.deleteQueryHistory(this, NetworkId.NRI, "1", "100000000");
// 2017-08-31: migrate BVB to use NVBW
final String BVB = "BVB";
migrateSelectedNetwork(BVB, NetworkId.NVBW);
@ -132,6 +128,13 @@ public class Application extends android.app.Application {
FavoriteStationsProvider.deleteFavoriteStations(this, IVB);
QueryHistoryProvider.deleteQueryHistory(this, IVB);
// 2018-11-05: migrate NRI to use RT
final String NRI = "NRI";
migrateSelectedNetwork(NRI, NetworkId.RT);
Downloader.deleteDownload(new File(getFilesDir(), NRI.toLowerCase(Locale.ENGLISH) + ".db"));
FavoriteStationsProvider.deleteFavoriteStations(this, NRI);
QueryHistoryProvider.deleteQueryHistory(this, NRI);
log.info("Migrations took {}", watch);
}

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

@ -42,7 +42,6 @@ import de.schildbach.pte.NasaProvider;
import de.schildbach.pte.NetworkId;
import de.schildbach.pte.NetworkProvider;
import de.schildbach.pte.NicaraguaProvider;
import de.schildbach.pte.NriProvider;
import de.schildbach.pte.NsProvider;
import de.schildbach.pte.NvbwProvider;
import de.schildbach.pte.NvvProvider;
@ -185,8 +184,6 @@ public final class NetworkProviderFactory {
return new DsbProvider();
else if (networkId.equals(NetworkId.SE))
return new SeProvider();
else if (networkId.equals(NetworkId.NRI))
return new NriProvider();
else if (networkId.equals(NetworkId.TLEM))
return new TlemProvider();
else if (networkId.equals(NetworkId.MERSEY))