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

Adapt to: SBB: Remove provider for Switzerland.

Browse source
This commit is contained in:
Andreas Schildbach 2021-09-18 13:24:21 +02:00
parent 15aa0e3d67
commit 3679727bc0
5 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
oeffi/assets/networks.txt
View file

@ -50,7 +50,6 @@ VMOBIL|de-AT|Vorarlberg;Bregenz|disabled
CZECH_REPUBLIC|cs-CZ|Tschechien;Praha;Prag|beta
# CH
SBB|de-CH|CH
VBL|de-CH|Luzern
ZVV|de-CH|Zürich

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

@ -85,8 +85,6 @@
<string name="network_vmobil_comment">Nicht verfügbar, weil der VVV ausdrücklich darum gebeten hat, nicht in Öffi enthalten zu sein. Du kannst stattdessen die ÖBB verwenden, das funktioniert für Vorarlberg auch gut.</string>
<string name="network_czech_republic_label">Prag</string>
<string name="network_czech_republic_comment">Lokal- und Regionalverkehr</string>
<string name="network_sbb_label">Schweiz</string>
<string name="network_sbb_comment">Fern- und Regionalverkehr (z.B. Genf, Basel, Bern)</string>
<string name="network_vbl_label">Luzern</string>
<string name="network_vbl_comment">nur Tram und Bus</string>
<string name="network_zvv_label">Zürich</string>

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

@ -85,8 +85,6 @@
<string name="network_vmobil_comment">Not available, because the VVV explicitly desires not to be included in Offi. You can use the ÖBB instead, it works well for Vorarlberg too.</string>
<string name="network_czech_republic_label">Prague</string>
<string name="network_czech_republic_comment">local and regional</string>
<string name="network_sbb_comment">long-distance and regional (e.g. Geneva, Basel, Bern)</string>
<string name="network_sbb_label">Switzerland</string>
<string name="network_vbl_label">Lucerne</string>
<string name="network_vbl_comment">tram and bus only</string>
<string name="network_zvv_label">Zurich</string>

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

@ -114,6 +114,12 @@ public class Application extends android.app.Application {
for (final File file : getFilesDir().listFiles(filter))
file.delete();
// 2021-09-18: migrate SBB to use RT
final String SBB = "SBB";
migrateSelectedNetwork(SBB, NetworkId.RT);
FavoriteStationsProvider.deleteFavoriteStations(this, SBB);
QueryHistoryProvider.deleteQueryHistory(this, SBB);
log.info("Migrations took {}", watch);
initNotificationManager();

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

@ -53,7 +53,6 @@ import de.schildbach.pte.ParisProvider;
import de.schildbach.pte.PlProvider;
import de.schildbach.pte.RtProvider;
import de.schildbach.pte.RtaChicagoProvider;
import de.schildbach.pte.SbbProvider;
import de.schildbach.pte.SeProvider;
import de.schildbach.pte.ShProvider;
import de.schildbach.pte.SncbProvider;
@ -176,8 +175,6 @@ public final class NetworkProviderFactory {
return new StvProvider();
else if (networkId.equals(NetworkId.CZECH_REPUBLIC))
return new CzechRepublicProvider(NAVITIA_AUTHORIZATION);
else if (networkId.equals(NetworkId.SBB))
return new SbbProvider();
else if (networkId.equals(NetworkId.VBL))
return new VblProvider();
else if (networkId.equals(NetworkId.ZVV))