From 90c3e706650758c623c98bbbbddee87c0e0065c0 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 4 Feb 2025 13:52:31 +0100 Subject: [PATCH 1/7] build.gradle: update Guava to 33.4.0-android --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index a62bfaf..2356b7b 100644 --- a/oeffi/build.gradle +++ b/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.3.0-android' + implementation 'com.google.guava:guava:33.4.0-android' implementation 'org.osmdroid:osmdroid-android:6.1.20' //noinspection GradleDependency implementation 'org.slf4j:slf4j-api:2.0.9' From 37949d2628e0de65861ecb94fb06067e49b8efee Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 8 Feb 2025 01:06:08 +0100 Subject: [PATCH 2/7] build.Containerfile: only install Debian packages that are strictly necessary --- build.Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.Containerfile b/build.Containerfile index 39577c6..34ac0a1 100644 --- a/build.Containerfile +++ b/build.Containerfile @@ -19,7 +19,7 @@ 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 && \ + /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 && \ From 53c5ea26b6646f9ef0d1ee2365098641b4091dfd Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 4 Feb 2025 13:52:45 +0100 Subject: [PATCH 3/7] build.Containerfile: use cache for Debian packages --- build.Containerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.Containerfile b/build.Containerfile index 34ac0a1..0de6cc3 100644 --- a/build.Containerfile +++ b/build.Containerfile @@ -18,7 +18,10 @@ FROM debian:bookworm-slim AS build-stage # install debian packages ENV DEBIAN_FRONTEND noninteractive -RUN /usr/bin/apt-get update && \ +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 && \ From e7e8af6a10bfddd6bb812a48ca514177445b7a4c Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 4 Feb 2025 13:54:52 +0100 Subject: [PATCH 4/7] build.Containerfile: use cache for the Android SDK --- build.Containerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.Containerfile b/build.Containerfile index 0de6cc3..d01c7d3 100644 --- a/build.Containerfile +++ b/build.Containerfile @@ -37,10 +37,12 @@ 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 \ + 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 && \ From cd6628088a08dc127db53c1f0b9d4014f19cd635 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 4 Feb 2025 13:57:45 +0100 Subject: [PATCH 5/7] build.Containerfile: use cache for Gradle/Maven build artifacts --- build.Containerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/build.Containerfile b/build.Containerfile index d01c7d3..a52d6b8 100644 --- a/build.Containerfile +++ b/build.Containerfile @@ -42,6 +42,7 @@ RUN --mount=target=/home/builder/android-sdk,type=cache,uid=1000,gid=1000,sharin # 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 ] ; \ then /bin/mv project project.u && /bin/mkdir project && \ /usr/bin/disorderfs --sort-dirents=yes --reverse-dirents=no project.u project ; \ From 2736bc82dd08937aebebf26a582949cc6a8c3205 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 10 Feb 2025 14:48:02 +0100 Subject: [PATCH 6/7] PL: re-add region Poland This more or less reverts commit 0c894a541da6e26fae68c0c00dcde021b95a0995. --- oeffi/assets/networks.txt | 3 +++ oeffi/res/values-de/networks.xml | 2 ++ oeffi/res/values/networks.xml | 2 ++ oeffi/res/xml/network_security_config.xml | 1 + .../de/schildbach/oeffi/network/NetworkProviderFactory.java | 6 +++++- 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt index d66c4f9..367e768 100644 --- a/oeffi/assets/networks.txt +++ b/oeffi/assets/networks.txt @@ -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 diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml index 591b3c3..af68f7f 100644 --- a/oeffi/res/values-de/networks.xml +++ b/oeffi/res/values-de/networks.xml @@ -97,6 +97,8 @@ 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)) From f1198671b1d0a9d433d094d9eae7e758e54cb482 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 16 Jun 2025 21:15:06 +0200 Subject: [PATCH 7/7] 13.0.11 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 4 ++++ public-transport-enabler | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) 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">