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

networks.txt: remove region Poland

Browse source
This commit is contained in:
Andreas Schildbach 2022-09-12 12:44:37 +02:00
parent 4299a6fd41
commit 0c894a541d
6 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

@ -87,9 +87,6 @@ MERSEY|en-UK|GB;Liverpool|beta
# IE # IE
TFI|ga-IE|IE;Dublin;GB;Belfast TFI|ga-IE|IE;Dublin;GB;Belfast
# PL
PL|pl-PL|PL;Warschau
# AE # AE
DUB|ae-AE|AE;Dubai|beta DUB|ae-AE|AE;Dubai|beta

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

@ -113,8 +113,6 @@
<string name="network_mersey_comment">Lokal- und Regionalverkehr</string> <string name="network_mersey_comment">Lokal- und Regionalverkehr</string>
<string name="network_tfi_label">Irland &amp; Nordirland</string> <string name="network_tfi_label">Irland &amp; Nordirland</string>
<string name="network_tfi_comment">Lokal- und Regionalverkehr</string> <string name="network_tfi_comment">Lokal- und Regionalverkehr</string>
<string name="network_pl_label">Polen</string>
<string name="network_pl_comment">Fern-, Regional und Lokalverkehr (z.B. Warschau)</string>
<string name="network_dub_label">Dubai</string> <string name="network_dub_label">Dubai</string>
<string name="network_dub_comment">Lokalverkehr</string> <string name="network_dub_comment">Lokalverkehr</string>
<string name="network_bart_label">San Francisco</string> <string name="network_bart_label">San Francisco</string>

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

@ -113,8 +113,6 @@
<string name="network_mersey_comment">local and regional</string> <string name="network_mersey_comment">local and regional</string>
<string name="network_tfi_label">Ireland &amp; Northern Ireland</string> <string name="network_tfi_label">Ireland &amp; Northern Ireland</string>
<string name="network_tfi_comment">local and regional</string> <string name="network_tfi_comment">local and regional</string>
<string name="network_pl_label">Poland</string>
<string name="network_pl_comment">long-distance, regional and local (e.g. Warsaw)</string>
<string name="network_dub_label">Dubai</string> <string name="network_dub_label">Dubai</string>
<string name="network_dub_comment">local</string> <string name="network_dub_comment">local</string>
<string name="network_bart_label">San Francisco</string> <string name="network_bart_label">San Francisco</string>

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

@ -17,7 +17,6 @@
<domain includeSubdomains="false">railteam.hafas.eu</domain><!-- Railteam --> <domain includeSubdomains="false">railteam.hafas.eu</domain><!-- Railteam -->
<domain includeSubdomains="false">mobil.vbl.ch</domain><!-- VBL --> <domain includeSubdomains="false">mobil.vbl.ch</domain><!-- VBL -->
<domain includeSubdomains="false">efa.vvo-online.de</domain><!-- VVO --> <domain includeSubdomains="false">efa.vvo-online.de</domain><!-- VVO -->
<domain includeSubdomains="false">mobil.rozklad-pkp.pl</domain><!-- PKP -->
</domain-config> </domain-config>
</network-security-config> </network-security-config>

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

@ -115,6 +115,12 @@ public class Application extends android.app.Application {
FavoriteStationsProvider.deleteFavoriteStations(this, SBB); FavoriteStationsProvider.deleteFavoriteStations(this, SBB);
QueryHistoryProvider.deleteQueryHistory(this, SBB); QueryHistoryProvider.deleteQueryHistory(this, SBB);
// 2022-09-12: migrate PL to use RT
final String PL = "PL";
migrateSelectedNetwork(PL, NetworkId.RT);
FavoriteStationsProvider.deleteFavoriteStations(this, PL);
QueryHistoryProvider.deleteQueryHistory(this, PL);
log.info("Migrations took {}", watch); log.info("Migrations took {}", watch);
} }

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

@ -50,7 +50,6 @@ import de.schildbach.pte.NvbwProvider;
import de.schildbach.pte.NvvProvider; import de.schildbach.pte.NvvProvider;
import de.schildbach.pte.OebbProvider; import de.schildbach.pte.OebbProvider;
import de.schildbach.pte.ParisProvider; import de.schildbach.pte.ParisProvider;
import de.schildbach.pte.PlProvider;
import de.schildbach.pte.RtProvider; 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;
@ -203,8 +202,6 @@ public final class NetworkProviderFactory {
return new MerseyProvider(); return new MerseyProvider();
else if (networkId.equals(NetworkId.TFI)) else if (networkId.equals(NetworkId.TFI))
return new TfiProvider(); return new TfiProvider();
else if (networkId.equals(NetworkId.PL))
return new PlProvider();
else if (networkId.equals(NetworkId.DUB)) else if (networkId.equals(NetworkId.DUB))
return new DubProvider(); return new DubProvider();
else if (networkId.equals(NetworkId.BART)) else if (networkId.equals(NetworkId.BART))