From 1eda102dc023d831c3ac724afe25c0b864eac0e2 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sun, 5 Nov 2023 21:40:22 +0100
Subject: [PATCH] networks.txt: remove TFI (Ireland)

---
 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 0294826..dca04bd 100644
--- a/oeffi/assets/networks.txt
+++ b/oeffi/assets/networks.txt
@@ -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
 
diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml
index 16f6bc2..0852204 100644
--- a/oeffi/res/values-de/networks.xml
+++ b/oeffi/res/values-de/networks.xml
@@ -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>
diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml
index d2b02f6..d546bcc 100644
--- a/oeffi/res/values/networks.xml
+++ b/oeffi/res/values/networks.xml
@@ -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>
diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java
index b3e3796..492c138 100644
--- a/oeffi/src/de/schildbach/oeffi/Application.java
+++ b/oeffi/src/de/schildbach/oeffi/Application.java
@@ -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);
     }
 
diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
index 2b16ff5..83c6e76 100644
--- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
+++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
@@ -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))