diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt index dca04bd..d13c8b3 100644 --- a/oeffi/assets/networks.txt +++ b/oeffi/assets/networks.txt @@ -8,7 +8,7 @@ DB|de-DE|DE BVG|de-DE|Brandenburg;Berlin VBB|de-DE|Brandenburg BAYERN|de-DE|Bayern;Würzburg;Regensburg -AVV|de-DE|Augsburg +AVV_AUGSBURG|de-DE|Augsburg MVV|de-DE|Bayern;München INVG|de-DE|Ingolstadt VGN|de-DE|Nürnberg;Fürth;Erlangen diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml index 0852204..750b7e3 100644 --- a/oeffi/res/values-de/networks.xml +++ b/oeffi/res/values-de/networks.xml @@ -19,8 +19,8 @@ Lokal- und Regionalverkehr Ingolstadt Lokal- und Regionalverkehr - Augsburg - nur Tram und Bus + Augsburg + nur Tram und Bus Verkehrsverbund Großraum Nürnberg Nürnberg, Fürth & Erlangen, Lokal- und Regionalverkehr Mittelschwaben (Krumbach, Günzburg, …) diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml index d546bcc..c4202a5 100644 --- a/oeffi/res/values/networks.xml +++ b/oeffi/res/values/networks.xml @@ -18,8 +18,8 @@ local and regional Ingolstadt local and regional - Augsburg - tram and bus only + Augsburg + tram and bus only Verkehrsverbund Großraum Nürnberg Nuremberg, Fürth & Erlangen, local and regional Mittelschwaben (Krumbach, Günzburg, …) diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java index 492c138..c64db6e 100644 --- a/oeffi/src/de/schildbach/oeffi/Application.java +++ b/oeffi/src/de/schildbach/oeffi/Application.java @@ -115,6 +115,12 @@ public class Application extends android.app.Application { FavoriteStationsProvider.deleteFavoriteStations(this, TFI); QueryHistoryProvider.deleteQueryHistory(this, TFI); + // 2023-11-16: migrate AVV to use AVV_AUGSBURG + final String AVV = "AVV"; + migrateSelectedNetwork(AVV, NetworkId.AVV_AUGSBURG); + FavoriteStationsProvider.deleteFavoriteStations(this, AVV); + QueryHistoryProvider.deleteQueryHistory(this, AVV); + 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 83c6e76..787cba3 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -21,7 +21,7 @@ import com.google.common.base.Charsets; import com.google.common.io.BaseEncoding; import de.schildbach.pte.AbstractNetworkProvider; import de.schildbach.pte.AvvAachenProvider; -import de.schildbach.pte.AvvProvider; +import de.schildbach.pte.AvvAugsburgProvider; import de.schildbach.pte.BartProvider; import de.schildbach.pte.BayernProvider; import de.schildbach.pte.BsvagProvider; @@ -119,8 +119,8 @@ public final class NetworkProviderFactory { else if (networkId.equals(NetworkId.INVG)) return new InvgProvider("{\"type\":\"AID\",\"aid\":\"GITvwi3BGOmTQ2a5\"}", "ERxotxpwFT7uYRsI".getBytes(Charsets.UTF_8)); - else if (networkId.equals(NetworkId.AVV)) - return new AvvProvider(); + else if (networkId.equals(NetworkId.AVV_AUGSBURG)) + return new AvvAugsburgProvider("{\"type\":\"AID\",\"aid\":\"jK91AVVZU77xY5oH\"}"); else if (networkId.equals(NetworkId.VGN)) return new VgnProvider(HttpUrl.parse("https://efa.vgn.de/vgnExt_oeffi/")); else if (networkId.equals(NetworkId.VVM))