From e66388c60d3963683c4c6855f45324ae60ca5000 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Fri, 9 Aug 2024 12:27:25 +0200
Subject: [PATCH] networks.txt: remove Finland

---
 oeffi/assets/networks.txt                                   | 3 ---
 oeffi/res/values-de/networks.xml                            | 2 --
 oeffi/res/values/networks.xml                               | 2 --
 oeffi/src/de/schildbach/oeffi/Application.java              | 6 ++++++
 .../de/schildbach/oeffi/network/NetworkProviderFactory.java | 3 ---
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt
index 538933b..9355a38 100644
--- a/oeffi/assets/networks.txt
+++ b/oeffi/assets/networks.txt
@@ -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
diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml
index 73c1612..9545206 100644
--- a/oeffi/res/values-de/networks.xml
+++ b/oeffi/res/values-de/networks.xml
@@ -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>
diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml
index c9035c3..8915363 100644
--- a/oeffi/res/values/networks.xml
+++ b/oeffi/res/values/networks.xml
@@ -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>
diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java
index 6196856..bae1145 100644
--- a/oeffi/src/de/schildbach/oeffi/Application.java
+++ b/oeffi/src/de/schildbach/oeffi/Application.java
@@ -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);
     }
 
diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
index 2d16419..03ce9e1 100644
--- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
+++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
@@ -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))