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

PL: re-add region Poland

Browse source 
This more or less reverts commit 0c894a541d.
This commit is contained in:
Andreas Schildbach 2025-02-10 14:48:02 +01:00
parent cd6628088a
commit 2736bc82dd
5 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
oeffi/assets/networks.txt
View file

@ -65,6 +65,9 @@ SE|sv-SE|SE;Stockholm
TLEM|en-UK|GB;Greater London;Derbyshire;Leicestershire;Rutland;Northamptonshire;Nottinghamshire;Lincolnshire;Berkshire;Buckinghamshire;East Sussex;Hampshire;Isle of Wight;Kent;Oxfordshire;Surrey;West Sussex;Essex;Hertfordshire;Bedfordshire;Cambridgeshire;Norfolk;Suffolk;Somerset;Gloucestershire;Wiltshire;Dorset;Devon;Cornwall;West Devon;Stowford;Eastleigh;Swindon;Gloucester;Plymouth;Torbay;Bournemouth;Poole;Birmingham
MERSEY|en-UK|GB;Liverpool|beta
# PL
PL|pl-PL|PL;Warschau
# AE
DUB|ae-AE|AE;Dubai|beta

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

@ -97,6 +97,8 @@
<string name="network_tlem_comment">Lokal- und Regionalverkehr (z.B. London, Birmingham)</string>
<string name="network_mersey_label">Liverpool</string>
<string name="network_mersey_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_comment">Lokalverkehr</string>
<string name="network_bart_label">San Francisco</string>

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

@ -97,6 +97,8 @@
<string name="network_tlem_comment">local and regional (e.g. London, Birmingham)</string>
<string name="network_mersey_label">Liverpool</string>
<string name="network_mersey_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_comment">local</string>
<string name="network_bart_label">San Francisco</string>

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

@ -15,6 +15,7 @@
<domain includeSubdomains="false">appefa10.verbundlinie.at</domain><!-- STV -->
<domain includeSubdomains="false">railteam.hafas.eu</domain><!-- Railteam -->
<domain includeSubdomains="false">mobil.vbl.ch</domain><!-- VBL -->
<domain includeSubdomains="false">mobil.rozklad-pkp.pl</domain><!-- PKP -->
</domain-config>
</network-security-config>

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

@ -46,6 +46,7 @@ import de.schildbach.pte.NsProvider;
import de.schildbach.pte.NvbwProvider;
import de.schildbach.pte.NvvProvider;
import de.schildbach.pte.OebbProvider;
import de.schildbach.pte.PlProvider;
import de.schildbach.pte.RtProvider;
import de.schildbach.pte.RtaChicagoProvider;
import de.schildbach.pte.SeProvider;
@ -86,7 +87,8 @@ public final class NetworkProviderFactory {
return cachedNetworkProvider;
final AbstractNetworkProvider networkProvider = forId(networkId);
networkProvider.setUserAgent(USER_AGENT);
if (networkId != NetworkId.PL)
networkProvider.setUserAgent(USER_AGENT);
providerCache.put(networkId, networkProvider);
return networkProvider;
}
@ -178,6 +180,8 @@ public final class NetworkProviderFactory {
return new TlemProvider();
else if (networkId.equals(NetworkId.MERSEY))
return new MerseyProvider();
else if (networkId.equals(NetworkId.PL))
return new PlProvider("{\"type\":\"AID\",\"aid\":\"DrxJYtYZQpEBCtcb\"}");
else if (networkId.equals(NetworkId.DUB))
return new DubProvider();
else if (networkId.equals(NetworkId.BART))