diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt
index 1a17562..39e7d26 100644
--- a/oeffi/assets/networks.txt
+++ b/oeffi/assets/networks.txt
@@ -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
diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml
index 197296b..afa67d9 100644
--- a/oeffi/res/values-de/networks.xml
+++ b/oeffi/res/values-de/networks.xml
@@ -101,8 +101,6 @@
Fern-, Regional und Lokalverkehr (z.B. Kopenhagen)
Schweden
Fern-, Regional und Lokalverkehr (z.B. Stockholm)
- Norwegen
- Fern-, Regional und Lokalverkehr (z.B. Oslo, Bergen)
England, Schottland & Wales.
Lokal- und Regionalverkehr (z.B. London, Birmingham)
Liverpool
diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml
index 93679a3..17e7625 100644
--- a/oeffi/res/values/networks.xml
+++ b/oeffi/res/values/networks.xml
@@ -102,8 +102,6 @@
long-distance, regional and local (e.g. Copenhagen)
Sweden
long-distance, regional and local (e.g. Stockholm)
- Norway
- long-distance, regional and local (e.g. Oslo, Bergen)
England, Scotland & Wales
local and regional (e.g. London, Birmingham)
Liverpool
diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java
index 7f3bbb0..2c3468e 100644
--- a/oeffi/src/de/schildbach/oeffi/Application.java
+++ b/oeffi/src/de/schildbach/oeffi/Application.java
@@ -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);
}
diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
index d901538..e5bc828 100644
--- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
+++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
@@ -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))