diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt index d13c8b3..538933b 100644 --- a/oeffi/assets/networks.txt +++ b/oeffi/assets/networks.txt @@ -61,9 +61,6 @@ PARIS|fr-FR|FR|alpha # ES SPAIN|es-ES|ES|alpha -# BE -SNCB|be-BE|BE|alpha - # LU LU|lb-LU|LU;Luxemburg diff --git a/oeffi/res/drawable-xhdpi/network_sncb_icon.png b/oeffi/res/drawable-xhdpi/network_sncb_icon.png deleted file mode 100644 index 67edda3..0000000 Binary files a/oeffi/res/drawable-xhdpi/network_sncb_icon.png and /dev/null differ diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml index 750b7e3..73c1612 100644 --- a/oeffi/res/values-de/networks.xml +++ b/oeffi/res/values-de/networks.xml @@ -93,8 +93,6 @@ Lokal- und Regionalverkehr Spanien Lokal- und Regionalverkehr (z.B. Barcelona) - Belgien - Fern-, Regional und Lokalverkehr (z.B. Antwerpen, Gent, Charleroi, BrĂ¼ssel) Luxemburg Lokal- und Regionalverkehr Niederlande diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml index c4202a5..c9035c3 100644 --- a/oeffi/res/values/networks.xml +++ b/oeffi/res/values/networks.xml @@ -93,8 +93,6 @@ local and regional Spain local and regional (e.g. Barcelona) - Belgium - long-distance, regional and local (e.g. Antwerp, Ghent, Charleroi, Brussels) Luxembourg local and regional Netherlands diff --git a/oeffi/res/xml/network_security_config.xml b/oeffi/res/xml/network_security_config.xml index c3d91c4..d2d41f7 100644 --- a/oeffi/res/xml/network_security_config.xml +++ b/oeffi/res/xml/network_security_config.xml @@ -10,7 +10,6 @@ - www.belgianrail.be android.vrsinfo.de wojhati.rta.ae appefa10.verbundlinie.at diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java index c64db6e..50599d5 100644 --- a/oeffi/src/de/schildbach/oeffi/Application.java +++ b/oeffi/src/de/schildbach/oeffi/Application.java @@ -121,6 +121,12 @@ public class Application extends android.app.Application { FavoriteStationsProvider.deleteFavoriteStations(this, AVV); QueryHistoryProvider.deleteQueryHistory(this, AVV); + // 2023-12-17: migrate SNCB to use RT + final String SNCB = "SNCB"; + migrateSelectedNetwork(SNCB, NetworkId.RT); + FavoriteStationsProvider.deleteFavoriteStations(this, SNCB); + QueryHistoryProvider.deleteQueryHistory(this, SNCB); + 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 6a6a6d7..2d16419 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -55,7 +55,6 @@ import de.schildbach.pte.RtProvider; import de.schildbach.pte.RtaChicagoProvider; import de.schildbach.pte.SeProvider; import de.schildbach.pte.ShProvider; -import de.schildbach.pte.SncbProvider; import de.schildbach.pte.SpainProvider; import de.schildbach.pte.StvProvider; import de.schildbach.pte.SydneyProvider; @@ -183,8 +182,6 @@ public final class NetworkProviderFactory { return new ParisProvider(NAVITIA_AUTHORIZATION); else if (networkId.equals(NetworkId.SPAIN)) return new SpainProvider(NAVITIA_AUTHORIZATION); - else if (networkId.equals(NetworkId.SNCB)) - return new SncbProvider("{\"type\":\"AID\",\"aid\":\"sncb-mobi\"}"); else if (networkId.equals(NetworkId.LU)) return new LuProvider("{\"type\":\"AID\",\"aid\":\"SkC81GuwuzL4e0\"}"); else if (networkId.equals(NetworkId.NS))