Adapt to: VAGFR: Merge Freiburg & Strasbourg into Baden-Württemberg, Constance & Basel.

oeffi/assets/networks.txt

@@ -32,8 +32,7 @@ VRN|de-DE|Baden-Württemberg;Rheinland-Pfalz;Mannheim;Mainz;Trier
 VVS|de-DE|Baden-Württemberg;Stuttgart
 DING|de-DE|Baden-Württemberg;Ulm;Neu-Ulm
 KVV|de-DE|Baden-Württemberg;Karlsruhe
-VAGFR|de-DE|Elsass;Bas-Rhin;Straßburg;Freiburg im Breisgau
+NVBW|de-DE|Baden-Württemberg;Konstanz;Basel;Basel-Stadt;Reutlingen;Rottweil;Tübingen;Sigmaringen;Freiburg im Breisgau;Elsass;Bas-Rhin;Straßburg
-NVBW|de-DE|Baden-Württemberg;Konstanz;Basel;Basel-Stadt;Reutlingen;Rottweil;Tübingen;Sigmaringen
 VVV|de-DE|Vogtland;Plauen
 VGS|de-DE|Saarland;Saarbrücken|disabled
 

oeffi/res/drawable-anydpi/network_vagfr_logo.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="48dp"
-    android:viewportHeight="157"
-    android:viewportWidth="157"
-    android:width="48dp" >
-
-    <group
-        android:translateX="-372.5"
-        android:translateY="-453.922647" >
-        <path
-            android:fillColor="#ed1c24"
-            android:pathData="M477.07813 500.23964c-8.00125 0 -14.50001 6.71 -14.5 14.9375 0 8.0775 6.49377 14.78128 14.3125 14.78125 3.87 0 7.73749 -1.76627 10.28125 -4.8125 2.545 -3.04875 2.94752 -6.23751 2.875 -10.125l-11.4375 0 0 2.96875 8.125 0c0 5.33375 -5.07628 9 -9.90625 9 -2.91375 0 -5.87626 -1.56122 -7.90625 -3.65625 -2.0625 -2.17375 -3.21874 -5.07623 -3.21875 -8.125 0 -6.47625 5.00122 -11.99998 11.34375 -12 4.09125 0 7.23873 2.03 9.5625 4.96875l2.25 -2.1875c-2.94875 -3.5075 -6.91372 -5.74998 -11.78125 -5.75zm-65 1.3125l10.0625 27.8125 9.3125 0 9.90625 -27.8125 -7.96875 0 -6.40625 20.6875 -6.375 -20.6875 -8.53125 0zm35.03125 0l-10.46875 27.8125 6.3125 0 1.78125 -5.53125 11 0 1.8125 5.53125 6.4375 0 -9.65625 -27.8125 -7.21875 0zm3.34375 5.90625l4.03125 11.3125 -7.96875 0 3.9375 -11.3125zm-35.9375 11.6875c-16.9375 5.86998 -23.34375 9.3125 -23.34375 9.3125 -19.87248 9.70999 -18.5 19.18745 -18.5 19.18745 0.90498 9.485 16.9375 13.0938 16.9375 13.0938 19.86501 5.3325 41.78125 3.4062 41.78125 3.4062 37.03498 -0.9024 68.71875 -13.75 68.71875 -13.75 25.96875 -9.9362 29.5 -21.0312 29.5 -21.0312l-1.28125 0.0625c-6.63623 11.64 -28.875 18.9063 -28.875 18.9063 -14.37751 5.9749 -37.3125 9.625 -37.3125 9.625 -33.04876 5.0562 -52.78125 1.7812 -52.78125 1.7812 -29.16499 -3.4112 -28.125 -14.125 -28.125 -14.125 -0.70998 -13.17376 34.09375 -24.84375 34.09375 -24.84375l-0.8125 -1.625z" />
-    </group>
-
-</vector>

oeffi/res/values-de/networks.xml

@@ -59,9 +59,7 @@
     <string name="network_ding_comment">Lokal- und Regionalverkehr</string>
     <string name="network_kvv_label">Karlsruher Verkehrsverbund</string>
     <string name="network_kvv_comment">Karlsruhe, Lokal- und Regionalverkehr</string>
-    <string name="network_vagfr_label">Freiburger Verkehrs AG</string>
+    <string name="network_nvbw_label">Baden-Württemberg, Straßburg, Konstanz &amp; Basel</string>
-    <string name="network_vagfr_comment">Freiburg &amp; Straßburg, Lokal- und Regionalverkehr</string>
-    <string name="network_nvbw_label">Baden-Württemberg, Konstanz &amp; Basel</string>
     <string name="network_nvbw_comment">Lokal- und Regionalverkehr</string>
     <string name="network_vvv_label">Plauen &amp; Vogtland</string>
     <string name="network_vvv_comment">Lokal- und Regionalverkehr</string>

oeffi/res/values/networks.xml

@@ -59,9 +59,7 @@
     <string name="network_ding_comment">local and regional</string>
     <string name="network_kvv_label">Karlsruher Verkehrsverbund</string>
     <string name="network_kvv_comment">Karlsruhe, local and regional</string>
-    <string name="network_vagfr_label">Freiburger Verkehrs AG</string>
+    <string name="network_nvbw_label">Baden-Württemberg, Strasbourg, Constance &amp; Basel</string>
-    <string name="network_vagfr_comment">Freiburg &amp; Strasbourg, local and regional</string>
-    <string name="network_nvbw_label">Baden-Württemberg, Constance &amp; Basel</string>
     <string name="network_nvbw_comment">local and regional</string>
     <string name="network_vvv_label">Plauen &amp; Vogtland</string>
     <string name="network_vvv_comment">local and regional</string>

oeffi/src/de/schildbach/oeffi/Application.java

@@ -139,6 +139,13 @@ public class Application extends android.app.Application {
         FavoriteStationsProvider.deleteFavoriteStations(this, NRI);
         QueryHistoryProvider.deleteQueryHistory(this, NRI);
 
+        // 2018-12-06: migrate VAGFR to use NVBW
+        final String VAGFR = "VAGFR";
+        migrateSelectedNetwork(VAGFR, NetworkId.NVBW);
+        Downloader.deleteDownload(new File(getFilesDir(), VAGFR.toLowerCase(Locale.ENGLISH) + ".db"));
+        FavoriteStationsProvider.migrateFavoriteStations(this, VAGFR, NetworkId.NVBW);
+        QueryHistoryProvider.migrateQueryHistory(this, VAGFR, NetworkId.NVBW);
+
         log.info("Migrations took {}", watch);
     }
 

oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java

@@ -60,7 +60,6 @@ import de.schildbach.pte.StvProvider;
 import de.schildbach.pte.SydneyProvider;
 import de.schildbach.pte.TfiProvider;
 import de.schildbach.pte.TlemProvider;
-import de.schildbach.pte.VagfrProvider;
 import de.schildbach.pte.VbbProvider;
 import de.schildbach.pte.VblProvider;
 import de.schildbach.pte.VbnProvider;
@@ -156,8 +155,6 @@ public final class NetworkProviderFactory {
             return new DingProvider();
         else if (networkId.equals(NetworkId.KVV))
             return new KvvProvider(HttpUrl.parse("https://projekte.kvv-efa.de/oeffi/"));
-        else if (networkId.equals(NetworkId.VAGFR))
-            return new VagfrProvider();
         else if (networkId.equals(NetworkId.NVBW))
             return new NvbwProvider();
         else if (networkId.equals(NetworkId.VVV))