From 3679727bc023b2aa3e825a9f618741c59b3f5346 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sat, 18 Sep 2021 13:24:21 +0200
Subject: [PATCH] Adapt to: SBB: Remove provider for Switzerland.

---
 oeffi/assets/networks.txt                                   | 1 -
 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(+), 8 deletions(-)

diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt
index a963e1f..5fe780e 100644
--- a/oeffi/assets/networks.txt
+++ b/oeffi/assets/networks.txt
@@ -50,7 +50,6 @@ VMOBIL|de-AT|Vorarlberg;Bregenz|disabled
 CZECH_REPUBLIC|cs-CZ|Tschechien;Praha;Prag|beta
 
 # CH
-SBB|de-CH|CH
 VBL|de-CH|Luzern
 ZVV|de-CH|Zürich
 
diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml
index 4f1d316..5ec93de 100644
--- a/oeffi/res/values-de/networks.xml
+++ b/oeffi/res/values-de/networks.xml
@@ -85,8 +85,6 @@
     <string name="network_vmobil_comment">Nicht verfügbar, weil der VVV ausdrücklich darum gebeten hat, nicht in Öffi enthalten zu sein. Du kannst stattdessen die ÖBB verwenden, das funktioniert für Vorarlberg auch gut.</string>
     <string name="network_czech_republic_label">Prag</string>
     <string name="network_czech_republic_comment">Lokal- und Regionalverkehr</string>
-    <string name="network_sbb_label">Schweiz</string>
-    <string name="network_sbb_comment">Fern- und Regionalverkehr (z.B. Genf, Basel, Bern)</string>
     <string name="network_vbl_label">Luzern</string>
     <string name="network_vbl_comment">nur Tram und Bus</string>
     <string name="network_zvv_label">Zürich</string>
diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml
index e2631b0..8a2eca1 100644
--- a/oeffi/res/values/networks.xml
+++ b/oeffi/res/values/networks.xml
@@ -85,8 +85,6 @@
     <string name="network_vmobil_comment">Not available, because the VVV explicitly desires not to be included in Offi. You can use the ÖBB instead, it works well for Vorarlberg too.</string>
     <string name="network_czech_republic_label">Prague</string>
     <string name="network_czech_republic_comment">local and regional</string>
-    <string name="network_sbb_comment">long-distance and regional (e.g. Geneva, Basel, Bern)</string>
-    <string name="network_sbb_label">Switzerland</string>
     <string name="network_vbl_label">Lucerne</string>
     <string name="network_vbl_comment">tram and bus only</string>
     <string name="network_zvv_label">Zurich</string>
diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java
index 6a6f9ef..a69fcab 100644
--- a/oeffi/src/de/schildbach/oeffi/Application.java
+++ b/oeffi/src/de/schildbach/oeffi/Application.java
@@ -114,6 +114,12 @@ public class Application extends android.app.Application {
         for (final File file : getFilesDir().listFiles(filter))
             file.delete();
 
+        // 2021-09-18: migrate SBB to use RT
+        final String SBB = "SBB";
+        migrateSelectedNetwork(SBB, NetworkId.RT);
+        FavoriteStationsProvider.deleteFavoriteStations(this, SBB);
+        QueryHistoryProvider.deleteQueryHistory(this, SBB);
+
         log.info("Migrations took {}", watch);
 
         initNotificationManager();
diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
index 102218a..c76ca61 100644
--- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
+++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
@@ -53,7 +53,6 @@ import de.schildbach.pte.ParisProvider;
 import de.schildbach.pte.PlProvider;
 import de.schildbach.pte.RtProvider;
 import de.schildbach.pte.RtaChicagoProvider;
-import de.schildbach.pte.SbbProvider;
 import de.schildbach.pte.SeProvider;
 import de.schildbach.pte.ShProvider;
 import de.schildbach.pte.SncbProvider;
@@ -176,8 +175,6 @@ public final class NetworkProviderFactory {
             return new StvProvider();
         else if (networkId.equals(NetworkId.CZECH_REPUBLIC))
             return new CzechRepublicProvider(NAVITIA_AUTHORIZATION);
-        else if (networkId.equals(NetworkId.SBB))
-            return new SbbProvider();
         else if (networkId.equals(NetworkId.VBL))
             return new VblProvider();
         else if (networkId.equals(NetworkId.ZVV))