mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-07 06:08:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

networks.txt: remove SNCB (Belgium)

Browse source
This commit is contained in:
Andreas Schildbach 2023-12-18 00:00:17 +01:00
parent bcf34c1de9
commit cf332416b8
7 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
oeffi/assets/networks.txt
View file

@ -61,9 +61,6 @@ PARIS|fr-FR|FR|alpha
# ES # ES
SPAIN|es-ES|ES|alpha SPAIN|es-ES|ES|alpha
# BE
SNCB|be-BE|BE|alpha
# LU # LU
LU|lb-LU|LU;Luxemburg LU|lb-LU|LU;Luxemburg

BIN
oeffi/res/drawable-xhdpi/network_sncb_icon.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

2
oeffi/res/values-de/networks.xml
View file

@ -93,8 +93,6 @@
<string name="network_paris_comment">Lokal- und Regionalverkehr</string> <string name="network_paris_comment">Lokal- und Regionalverkehr</string>
<string name="network_spain_label">Spanien</string> <string name="network_spain_label">Spanien</string>
<string name="network_spain_comment">Lokal- und Regionalverkehr (z.B. Barcelona)</string> <string name="network_spain_comment">Lokal- und Regionalverkehr (z.B. Barcelona)</string>
<string name="network_sncb_label">Belgien</string>
<string name="network_sncb_comment">Fern-, Regional und Lokalverkehr (z.B. Antwerpen, Gent, Charleroi, Brüssel)</string>
<string name="network_lu_label">Luxemburg</string> <string name="network_lu_label">Luxemburg</string>
<string name="network_lu_comment">Lokal- und Regionalverkehr</string> <string name="network_lu_comment">Lokal- und Regionalverkehr</string>
<string name="network_ns_label">Niederlande</string> <string name="network_ns_label">Niederlande</string>

2
oeffi/res/values/networks.xml
View file

@ -93,8 +93,6 @@
<string name="network_paris_comment">local and regional</string> <string name="network_paris_comment">local and regional</string>
<string name="network_spain_label">Spain</string> <string name="network_spain_label">Spain</string>
<string name="network_spain_comment">local and regional (e.g. Barcelona)</string> <string name="network_spain_comment">local and regional (e.g. Barcelona)</string>
<string name="network_sncb_label">Belgium</string>
<string name="network_sncb_comment">long-distance, regional and local (e.g. Antwerp, Ghent, Charleroi, Brussels)</string>
<string name="network_lu_label">Luxembourg</string> <string name="network_lu_label">Luxembourg</string>
<string name="network_lu_comment">local and regional</string> <string name="network_lu_comment">local and regional</string>
<string name="network_ns_label">Netherlands</string> <string name="network_ns_label">Netherlands</string>

1
oeffi/res/xml/network_security_config.xml
View file

@ -10,7 +10,6 @@
<!-- This is the hall of shame: public transport authorities which still do not support HTTPS. --> <!-- This is the hall of shame: public transport authorities which still do not support HTTPS. -->
<domain-config cleartextTrafficPermitted="true"> <domain-config cleartextTrafficPermitted="true">
<domain includeSubdomains="false">www.belgianrail.be</domain><!-- SNCB/NMBS -->
<domain includeSubdomains="false">android.vrsinfo.de</domain><!-- VRS --> <domain includeSubdomains="false">android.vrsinfo.de</domain><!-- VRS -->
<domain includeSubdomains="false">wojhati.rta.ae</domain><!-- RTA Dubai --> <domain includeSubdomains="false">wojhati.rta.ae</domain><!-- RTA Dubai -->
<domain includeSubdomains="false">appefa10.verbundlinie.at</domain><!-- STV --> <domain includeSubdomains="false">appefa10.verbundlinie.at</domain><!-- STV -->

6
oeffi/src/de/schildbach/oeffi/Application.java
View file

@ -121,6 +121,12 @@ public class Application extends android.app.Application {
FavoriteStationsProvider.deleteFavoriteStations(this, AVV); FavoriteStationsProvider.deleteFavoriteStations(this, AVV);
QueryHistoryProvider.deleteQueryHistory(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); log.info("Migrations took {}", watch);
} }

3
oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
View file

@ -55,7 +55,6 @@ import de.schildbach.pte.RtProvider;
import de.schildbach.pte.RtaChicagoProvider; import de.schildbach.pte.RtaChicagoProvider;
import de.schildbach.pte.SeProvider; import de.schildbach.pte.SeProvider;
import de.schildbach.pte.ShProvider; import de.schildbach.pte.ShProvider;
import de.schildbach.pte.SncbProvider;
import de.schildbach.pte.SpainProvider; import de.schildbach.pte.SpainProvider;
import de.schildbach.pte.StvProvider; import de.schildbach.pte.StvProvider;
import de.schildbach.pte.SydneyProvider; import de.schildbach.pte.SydneyProvider;
@ -183,8 +182,6 @@ public final class NetworkProviderFactory {
return new ParisProvider(NAVITIA_AUTHORIZATION); return new ParisProvider(NAVITIA_AUTHORIZATION);
else if (networkId.equals(NetworkId.SPAIN)) else if (networkId.equals(NetworkId.SPAIN))
return new SpainProvider(NAVITIA_AUTHORIZATION); 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)) else if (networkId.equals(NetworkId.LU))
return new LuProvider("{\"type\":\"AID\",\"aid\":\"SkC81GuwuzL4e0\"}"); return new LuProvider("{\"type\":\"AID\",\"aid\":\"SkC81GuwuzL4e0\"}");
else if (networkId.equals(NetworkId.NS)) else if (networkId.equals(NetworkId.NS))