build.Containerfile

@@ -18,11 +18,8 @@ FROM debian:bookworm-slim AS build-stage
 
 # install debian packages
 ENV DEBIAN_FRONTEND noninteractive
-RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
-    --mount=target=/var/cache/apt,type=cache,sharing=locked \
-    /bin/rm -f /etc/apt/apt.conf.d/docker-clean && \
-    /usr/bin/apt-get update && \
-    /usr/bin/apt-get --yes --no-install-recommends install disorderfs openjdk-17-jdk-headless gradle sdkmanager && \
+RUN /usr/bin/apt-get update && \
+    /usr/bin/apt-get --yes install disorderfs openjdk-17-jdk-headless gradle sdkmanager && \
     /bin/ln -fs /usr/share/zoneinfo/CET /etc/localtime && \
     /usr/sbin/dpkg-reconfigure --frontend noninteractive tzdata && \
     /bin/ln -s /proc/self/mounts /etc/mtab && \
@@ -37,13 +34,10 @@ COPY --chown=builder / project/
 
 # accept SDK licenses
 ENV ANDROID_HOME /home/builder/android-sdk
-RUN --mount=target=/home/builder/android-sdk,type=cache,uid=1000,gid=1000,sharing=locked \
-    yes | /usr/bin/sdkmanager --licenses >/dev/null
+RUN yes | /usr/bin/sdkmanager --licenses >/dev/null
 
 # build project
-RUN --mount=target=/home/builder/android-sdk,type=cache,uid=1000,gid=1000,sharing=locked \
-    --mount=target=/home/builder/.gradle,type=cache,uid=1000,gid=1000,sharing=locked \
-    if [ -e /dev/fuse ] ; \
+RUN if [ -e /dev/fuse ] ; \
       then /bin/mv project project.u && /bin/mkdir project && \
       /usr/bin/disorderfs --sort-dirents=yes --reverse-dirents=no project.u project ; \
     fi && \

oeffi/AndroidManifest.xml

@@ -20,8 +20,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="de.schildbach.oeffi"
-    android:versionCode="130011"
-    android:versionName="13.0.11">
+    android:versionCode="130010"
+    android:versionName="13.0.10">
 
     <uses-sdk
         android:minSdkVersion="24"

oeffi/CHANGES

@@ -1,7 +1,3 @@
-v13.0.11
-
-* Add region again: Poland (PKP)
-
 v13.0.4-v13.0.10
 
 * Target Android 15.

oeffi/assets/networks.txt

@@ -65,9 +65,6 @@ 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
 

oeffi/build.gradle

@@ -25,7 +25,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:3.12.13'
     //noinspection GradleDependency
     implementation 'com.squareup.okhttp3:logging-interceptor:3.12.13'
-    implementation 'com.google.guava:guava:33.4.0-android'
+    implementation 'com.google.guava:guava:33.3.0-android'
     implementation 'org.osmdroid:osmdroid-android:6.1.20'
     //noinspection GradleDependency
     implementation 'org.slf4j:slf4j-api:2.0.9'

oeffi/res/values-de/networks.xml

@@ -97,8 +97,6 @@
     <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>

oeffi/res/values/networks.xml

@@ -97,8 +97,6 @@
     <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>

oeffi/res/xml/network_security_config.xml

@@ -15,7 +15,6 @@
         <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>

oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java

@@ -46,7 +46,6 @@ 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;
@@ -87,8 +86,7 @@ public final class NetworkProviderFactory {
             return cachedNetworkProvider;
 
         final AbstractNetworkProvider networkProvider = forId(networkId);
-        if (networkId != NetworkId.PL)
-            networkProvider.setUserAgent(USER_AGENT);
+        networkProvider.setUserAgent(USER_AGENT);
         providerCache.put(networkId, networkProvider);
         return networkProvider;
     }
@@ -180,8 +178,6 @@ 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))

public-transport-enabler

@@ -1 +1 @@
-Subproject commit c7f77ac4c89b9dbb31625998b9de1dd3d617d68a
+Subproject commit 03a0929d056ed3025c981349bc123a34f72cd5dc