diff --git a/build.Containerfile b/build.Containerfile index 39577c6..a52d6b8 100644 --- a/build.Containerfile +++ b/build.Containerfile @@ -18,8 +18,11 @@ FROM debian:bookworm-slim AS build-stage # install debian packages ENV DEBIAN_FRONTEND noninteractive -RUN /usr/bin/apt-get update && \ - /usr/bin/apt-get --yes install disorderfs openjdk-17-jdk-headless gradle sdkmanager && \ +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 && \ /bin/ln -fs /usr/share/zoneinfo/CET /etc/localtime && \ /usr/sbin/dpkg-reconfigure --frontend noninteractive tzdata && \ /bin/ln -s /proc/self/mounts /etc/mtab && \ @@ -34,10 +37,13 @@ COPY --chown=builder / project/ # accept SDK licenses ENV ANDROID_HOME /home/builder/android-sdk -RUN yes | /usr/bin/sdkmanager --licenses >/dev/null +RUN --mount=target=/home/builder/android-sdk,type=cache,uid=1000,gid=1000,sharing=locked \ + yes | /usr/bin/sdkmanager --licenses >/dev/null # build project -RUN if [ -e /dev/fuse ] ; \ +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 ] ; \ then /bin/mv project project.u && /bin/mkdir project && \ /usr/bin/disorderfs --sort-dirents=yes --reverse-dirents=no project.u project ; \ fi && \ diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 9c31937..b68ae87 100644 --- a/oeffi/AndroidManifest.xml +++ b/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="130010" - android:versionName="13.0.10"> + android:versionCode="130011" + android:versionName="13.0.11"> Lokal- und Regionalverkehr (z.B. London, Birmingham) Liverpool Lokal- und Regionalverkehr + Polen + Fern-, Regional und Lokalverkehr (z.B. Warschau) Dubai Lokalverkehr San Francisco diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml index e7a6def..936d8db 100644 --- a/oeffi/res/values/networks.xml +++ b/oeffi/res/values/networks.xml @@ -97,6 +97,8 @@ local and regional (e.g. London, Birmingham) Liverpool local and regional + Poland + long-distance, regional and local (e.g. Warsaw) Dubai local San Francisco diff --git a/oeffi/res/xml/network_security_config.xml b/oeffi/res/xml/network_security_config.xml index d2d41f7..0bd486a 100644 --- a/oeffi/res/xml/network_security_config.xml +++ b/oeffi/res/xml/network_security_config.xml @@ -15,6 +15,7 @@ appefa10.verbundlinie.at railteam.hafas.eu mobil.vbl.ch + mobil.rozklad-pkp.pl diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index 969d7dc..886733c 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -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)) diff --git a/public-transport-enabler b/public-transport-enabler index 03a0929..c7f77ac 160000 --- a/public-transport-enabler +++ b/public-transport-enabler @@ -1 +1 @@ -Subproject commit 03a0929d056ed3025c981349bc123a34f72cd5dc +Subproject commit c7f77ac4c89b9dbb31625998b9de1dd3d617d68a