From cf332416b823c10661d9ce470013928f07ee082f Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 18 Dec 2023 00:00:17 +0100 Subject: [PATCH] networks.txt: remove SNCB (Belgium) --- oeffi/assets/networks.txt | 3 --- oeffi/res/drawable-xhdpi/network_sncb_icon.png | Bin 1427 -> 0 bytes oeffi/res/values-de/networks.xml | 2 -- oeffi/res/values/networks.xml | 2 -- oeffi/res/xml/network_security_config.xml | 1 - oeffi/src/de/schildbach/oeffi/Application.java | 6 ++++++ .../oeffi/network/NetworkProviderFactory.java | 3 --- 7 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 oeffi/res/drawable-xhdpi/network_sncb_icon.png 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 67edda3db943acc68ad2b81e191c08eea461225f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1427 zcmV;E1#J3>P)dpn+a&e{3BXYV=hE4*Jgf4uMeyFB0X z{GQ))`Tf9$4<9~!`0(MwN1CCxw%`ire(lgtdY^Qy4s&XTKpKUw;Q>ZU0CW(?DFA9I zkuYdCJrr_E9GE3LZQ?&n3DBvF$mb6V2vbIngh8JrKsLp4%Ig~FBCF4f^K>$W9n1q@ zB$u7gz#tndd4W;efWD@i^aWu3O`q;!3RvR9EXjloC<15+tC+)O8D&6qJWT*}5@v9} zjqj0$v}!;Bp3tq@L=AHZurs;%0!OWfU=s0Rjc(M6fo`__EulQEW-kjFZ#^#t(4o3Y zFX%_HQ!0WU;&$V?7xO%iM0%I%c1eLkAkjamt63NGp`1EGG>{K8lTR(B(i!Ph!Y*=c z&VPavx$AKdz#BFR zD6-i@;{Qy@G%C8`2R8QxYo0(iK?&Q9Mt6Hg{8t!eDtU-^)0spJD+dB+6o zM57S`@|Oe{#U9tCAFTB$XJithGN#3Wj8hn|TXdpnk{O7}298k(KpPdZ2|(+3)CEm! zppf%)u$6t%mN?0Y$)fZzYJ2N8a#;}+Mi6p!QT;{(FLPQ+Yc~LQ$ zv#wL9mm*TrfIye);$N2{g;bZ2G;*+a7!J8apj{_P9M@)8O;ZFt!PivN#jmt5!Pt77 z!#7-@g>`-FMaJd8zP?b4_{Akn6iIzb1Y!uCq`(ydS0yi%Z8R3kT++bq)cim!=D0*) zgHr@n0@rEGIDs8~ccRn@%mxaXNH#kuWH9-h%m{%Y`lAfoh!wJ!CA<2De%g`rTx{S4 zm)UgDBLm-s;?gSMRhE#GMgqkgkW?I*F@@pGXJeX#UoDkJ`M?0ghxC={kIM9TiKU|f zfxugi3%--yBG<9_rcc#8u~y0rrH`VBpu1Cq)uy~IDs$z9UyXT!~~sEXmZHm^p&#)t1uaj zeVpNa&;Vm>jC9GYO6@2C4ahY8j8@JOWGU0><~Vz0rS*9sZN@h6H}{z}blMLfH-33^ zL|w+|4fmQ2?-M;Fhg~6%G}I`e#;ECVX)_x$qqPMwzg1>@$dOqMKRR0BX#x@kX$PtkHVJy#1|t9S0Qciaz1?c h@ZrOU4<9}Z@gETEdf*i5`~?62002ovPDHLkV1ivnpxpof 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))