From b25e8c14f8999f47790b2915738fe4e93d9608e7 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 25 Mar 2023 19:36:58 +0100 Subject: [PATCH 001/111] .gitlab-ci.yml: revise combinations of JDK and OS There are now 4 jobs: * using OpenJDK 11 on Debian Bullseye (our current reference), * using OpenJDK 17 on Debian Bookworm (our future reference), * using OpenJDK 11 on Ubuntu Jammy, and * using OpenJDK 17 on Ubuntu Lunar --- .gitlab-ci.yml | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7cbfaed..26bc698 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,20 +1,41 @@ -image: ${DOCKER_IMAGE} - variables: - GIT_SUBMODULE_STRATEGY: recursive - ANDROID_HOME: $PWD/android-sdk + GIT_SUBMODULE_STRATEGY: recursive + ANDROID_HOME: $PWD/android-sdk before_script: - apt-get update - - apt-get -y upgrade - - apt-get -y install ${JDK_PACKAGE} - - apt-get -y install sdkmanager gradle - - yes | sdkmanager --licenses >/dev/null || true -build: - parallel: - matrix: - - DOCKER_IMAGE: [ ubuntu:jammy, debian:bullseye-backports ] - JDK_PACKAGE: [ openjdk-11-jdk-headless ] +after_script: + - gradle --version + +bullseye-jdk11: + image: debian:bullseye-backports script: + - apt-get -y install openjdk-11-jdk-headless + - apt-get -y install sdkmanager gradle + - yes | sdkmanager --licenses >/dev/null || true + - gradle build --stacktrace + +bookworm-jdk17: + image: debian:bookworm-slim + script: + - apt-get -y install openjdk-17-jdk-headless + - apt-get -y install sdkmanager gradle + - yes | sdkmanager --licenses >/dev/null || true + - gradle build --stacktrace + +jammy-jdk11: + image: ubuntu:jammy + script: + - apt-get -y install openjdk-11-jdk-headless + - apt-get -y install sdkmanager gradle + - yes | sdkmanager --licenses >/dev/null || true + - gradle build --stacktrace + +lunar-jdk17: + image: ubuntu:lunar + script: + - apt-get -y install openjdk-17-jdk-headless + - apt-get -y install sdkmanager gradle + - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace From 271659d914cf21eb5ac1e7c7c94c6e16ca182ae6 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 25 Mar 2023 15:54:16 +0100 Subject: [PATCH 002/111] build.gradle: update SDK Build Tools to 33.0.2 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 5a4af95..cfbb8b3 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -31,7 +31,7 @@ dependencies { android { compileSdkVersion 'android-33' - buildToolsVersion '33.0.0' + buildToolsVersion '33.0.2' defaultConfig { generatedDensities = ['hdpi', 'xhdpi'] From d6b9e00937d615001c6da06f51ae18a6a942ffb7 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 25 Mar 2023 23:30:46 +0100 Subject: [PATCH 003/111] .gitlab-ci.yml: create job artifacts --- .gitlab-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26bc698..9a66944 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,10 @@ bullseye-jdk11: - apt-get -y install sdkmanager gradle - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + artifacts: + name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA + paths: + - oeffi/build/outputs/apk/**/*.apk bookworm-jdk17: image: debian:bookworm-slim @@ -23,6 +27,10 @@ bookworm-jdk17: - apt-get -y install sdkmanager gradle - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + artifacts: + name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA + paths: + - oeffi/build/outputs/apk/**/*.apk jammy-jdk11: image: ubuntu:jammy @@ -31,6 +39,10 @@ jammy-jdk11: - apt-get -y install sdkmanager gradle - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + artifacts: + name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA + paths: + - oeffi/build/outputs/apk/**/*.apk lunar-jdk17: image: ubuntu:lunar @@ -39,3 +51,7 @@ lunar-jdk17: - apt-get -y install sdkmanager gradle - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + artifacts: + name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA + paths: + - oeffi/build/outputs/apk/**/*.apk From 8f1c8f19862bc582ceaa50561c15fa06db99cb55 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 25 Mar 2023 16:13:58 +0100 Subject: [PATCH 004/111] build.gradle: update AndroidX RecyclerView to 1.3.0 --- oeffi/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index cfbb8b3..5f0c219 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -7,13 +7,12 @@ configurations { all*.exclude group: 'org.json', module: 'json' all*.exclude group: 'net.sf.kxml', module: 'kxml2' all*.exclude group: 'androidx.legacy', module: 'legacy-support-core-ui' - all*.exclude group: 'androidx.core', module: 'core-ktx' } dependencies { implementation project(':public-transport-enabler') implementation 'androidx.annotation:annotation:1.5.0' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.1.1' implementation 'androidx.core:core:1.9.0' From d4f9ab68f1cf3cdfaccf4ff78cb7c888d345558f Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 29 Mar 2023 10:33:22 +0200 Subject: [PATCH 005/111] build.gradle: update AndroidX Activity to 1.7.0 --- oeffi/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 5f0c219..1f622aa 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -7,6 +7,8 @@ configurations { all*.exclude group: 'org.json', module: 'json' all*.exclude group: 'net.sf.kxml', module: 'kxml2' all*.exclude group: 'androidx.legacy', module: 'legacy-support-core-ui' + all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7' + all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8' } dependencies { @@ -16,7 +18,7 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.1.1' implementation 'androidx.core:core:1.9.0' - implementation 'androidx.activity:activity:1.6.1' + implementation 'androidx.activity:activity:1.7.0' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.13' //noinspection GradleDependency From b919448d01a1e3939a621a66a0a9b2c739e6c6a4 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 29 Mar 2023 10:34:45 +0200 Subject: [PATCH 006/111] build.gradle: update AndroidX DrawerLayout to 1.2.0 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 1f622aa..2bb80b3 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -16,7 +16,7 @@ dependencies { implementation 'androidx.annotation:annotation:1.5.0' implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' - implementation 'androidx.drawerlayout:drawerlayout:1.1.1' + implementation 'androidx.drawerlayout:drawerlayout:1.2.0' implementation 'androidx.core:core:1.9.0' implementation 'androidx.activity:activity:1.7.0' //noinspection GradleDependency From 56bc7f5278a0700f41e637a07261da04312e3cff Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 29 Mar 2023 10:37:50 +0200 Subject: [PATCH 007/111] build.gradle: update logback-android to 3.0.0 --- oeffi/build.gradle | 2 +- oeffi/proguard.cfg | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 2bb80b3..fd99b25 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -26,7 +26,7 @@ dependencies { implementation 'com.google.guava:guava:31.1-android' implementation 'org.osmdroid:osmdroid-android:6.1.14' implementation 'org.slf4j:slf4j-api:1.7.36' - implementation 'com.github.tony19:logback-android:2.0.1' + implementation 'com.github.tony19:logback-android:3.0.0' testImplementation 'junit:junit:4.13.2' } diff --git a/oeffi/proguard.cfg b/oeffi/proguard.cfg index 236ee08..0c6bf6f 100644 --- a/oeffi/proguard.cfg +++ b/oeffi/proguard.cfg @@ -79,8 +79,9 @@ -dontnote dalvik.system.CloseGuard # slf4j --dontwarn org.slf4j.MDC --dontwarn org.slf4j.MarkerFactory +-dontwarn org.slf4j.spi.SLF4JServiceProvider +-dontwarn org.slf4j.LoggerFactory +-dontwarn ch.qos.logback.classic.Logger # logback-android -dontwarn javax.mail.** From 75e279bb2071bab718b4e4bfc1375649b5cb6ed9 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 29 Mar 2023 10:38:58 +0200 Subject: [PATCH 008/111] build.gradle: update SLF4J to 2.0.7 --- oeffi/build.gradle | 2 +- oeffi/proguard.cfg | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index fd99b25..47e7cf5 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation 'com.squareup.okhttp3:logging-interceptor:3.12.13' implementation 'com.google.guava:guava:31.1-android' implementation 'org.osmdroid:osmdroid-android:6.1.14' - implementation 'org.slf4j:slf4j-api:1.7.36' + implementation 'org.slf4j:slf4j-api:2.0.7' implementation 'com.github.tony19:logback-android:3.0.0' testImplementation 'junit:junit:4.13.2' } diff --git a/oeffi/proguard.cfg b/oeffi/proguard.cfg index 0c6bf6f..1566d6d 100644 --- a/oeffi/proguard.cfg +++ b/oeffi/proguard.cfg @@ -78,12 +78,8 @@ -dontnote com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper -dontnote dalvik.system.CloseGuard -# slf4j --dontwarn org.slf4j.spi.SLF4JServiceProvider --dontwarn org.slf4j.LoggerFactory --dontwarn ch.qos.logback.classic.Logger - -# logback-android +# SLF4J, logback-android +-keep class org.slf4j.impl.LoggerServiceProvider -dontwarn javax.mail.** -dontnote ch.qos.logback.core.android.AndroidContextUtil From 1ec70d18865dc2ca8072832af03de6142feb04b6 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 25 Mar 2023 16:06:40 +0100 Subject: [PATCH 009/111] Nullable: use annotation from `javax.annotation` --- oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java | 2 +- .../src/de/schildbach/oeffi/directions/DirectionsActivity.java | 2 +- oeffi/src/de/schildbach/oeffi/directions/LocationView.java | 2 +- .../de/schildbach/oeffi/directions/TripsGalleryAdapter.java | 2 +- .../de/schildbach/oeffi/directions/TripsOverviewActivity.java | 2 +- .../directions/list/QueryHistoryContextMenuItemListener.java | 3 ++- oeffi/src/de/schildbach/oeffi/network/NetworkResources.java | 2 +- .../de/schildbach/oeffi/network/list/NetworkViewHolder.java | 3 ++- oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java | 2 +- oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java | 2 +- oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java | 2 +- oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java | 2 +- oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java | 2 +- oeffi/src/de/schildbach/oeffi/preference/AboutFragment.java | 3 ++- oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java | 3 ++- .../src/de/schildbach/oeffi/preference/DirectionsFragment.java | 3 ++- oeffi/src/de/schildbach/oeffi/preference/DonateFragment.java | 3 ++- .../de/schildbach/oeffi/stations/FavoriteStationsActivity.java | 2 +- oeffi/src/de/schildbach/oeffi/stations/Station.java | 2 +- .../de/schildbach/oeffi/stations/StationDetailsActivity.java | 2 +- oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java | 2 +- .../oeffi/stations/list/FavoriteStationsAdapter.java | 3 ++- .../oeffi/stations/list/StationContextMenuItemListener.java | 2 +- .../de/schildbach/oeffi/stations/list/StationViewHolder.java | 2 +- oeffi/src/de/schildbach/oeffi/util/Downloader.java | 2 +- 25 files changed, 32 insertions(+), 25 deletions(-) diff --git a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java index 73b32cd..fbab782 100644 --- a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java +++ b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java @@ -37,7 +37,6 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import androidx.annotation.Nullable; import androidx.core.view.MenuProvider; import androidx.drawerlayout.widget.DrawerLayout; import androidx.recyclerview.widget.LinearLayoutManager; @@ -72,6 +71,7 @@ import okhttp3.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java index ea0dbd9..7d1b8a8 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java @@ -61,7 +61,6 @@ import android.widget.TextView; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContract; import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.content.ContextCompat; import androidx.core.view.ViewCompat; @@ -118,6 +117,7 @@ import org.osmdroid.views.overlay.Overlay; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import javax.net.ssl.SSLException; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/oeffi/src/de/schildbach/oeffi/directions/LocationView.java b/oeffi/src/de/schildbach/oeffi/directions/LocationView.java index da74771..7c14a5b 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/LocationView.java +++ b/oeffi/src/de/schildbach/oeffi/directions/LocationView.java @@ -41,7 +41,6 @@ import android.widget.FrameLayout; import android.widget.ListAdapter; import android.widget.PopupMenu; import android.widget.TextView.OnEditorActionListener; -import androidx.annotation.Nullable; import com.google.common.base.Strings; import de.schildbach.oeffi.Constants; import de.schildbach.oeffi.R; @@ -53,6 +52,7 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.Point; +import javax.annotation.Nullable; import java.util.Locale; public class LocationView extends FrameLayout implements LocationHelper.Callback { diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java b/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java index 7d1d88c..01f314e 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java @@ -41,7 +41,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Adapter; import android.widget.BaseAdapter; -import androidx.annotation.Nullable; import com.google.common.base.Preconditions; import de.schildbach.oeffi.R; import de.schildbach.pte.dto.Line; @@ -53,6 +52,7 @@ import de.schildbach.pte.dto.Trip.Individual; import de.schildbach.pte.dto.Trip.Leg; import de.schildbach.pte.dto.Trip.Public; +import javax.annotation.Nullable; import java.util.Collections; import java.util.Date; import java.util.List; diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java index 59d544f..ad62ea8 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java @@ -31,7 +31,6 @@ import android.text.format.DateUtils; import android.view.View; import android.widget.AdapterView; import android.widget.TextView; -import androidx.annotation.Nullable; import com.google.common.collect.ComparisonChain; import com.google.common.collect.Ordering; import com.google.common.util.concurrent.Uninterruptibles; @@ -54,6 +53,7 @@ import de.schildbach.pte.exception.SessionExpiredException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import javax.net.ssl.SSLException; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java b/oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java index 74d0179..a8a2f54 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java +++ b/oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java @@ -17,9 +17,10 @@ package de.schildbach.oeffi.directions.list; -import androidx.annotation.Nullable; import de.schildbach.pte.dto.Location; +import javax.annotation.Nullable; + public interface QueryHistoryContextMenuItemListener { boolean onQueryHistoryContextMenuItemClick(int adapterPosition, Location from, Location to, @Nullable byte[] serializedSavedTrip, int menuItemId, @Nullable Location menuItemLocation); diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkResources.java b/oeffi/src/de/schildbach/oeffi/network/NetworkResources.java index a4b3f61..69e6e7d 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkResources.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkResources.java @@ -20,8 +20,8 @@ package de.schildbach.oeffi.network; import android.content.Context; import android.content.res.Resources; import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; +import javax.annotation.Nullable; import java.util.Locale; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java b/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java index e943777..62e3160 100644 --- a/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java +++ b/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java @@ -24,11 +24,12 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; -import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import de.schildbach.oeffi.R; import de.schildbach.oeffi.network.NetworkResources; +import javax.annotation.Nullable; + public class NetworkViewHolder extends RecyclerView.ViewHolder { private final Context context; private final Resources res; diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java index f2ff948..15a4591 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java @@ -36,7 +36,6 @@ import android.widget.PopupMenu; import android.widget.TextView; import android.widget.ViewAnimator; import androidx.activity.ComponentActivity; -import androidx.annotation.Nullable; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -68,6 +67,7 @@ import okhttp3.HttpUrl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.File; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java b/oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java index 3517dbc..058993d 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java @@ -25,7 +25,6 @@ import android.database.CursorWrapper; import android.database.MatrixCursor; import android.net.Uri; import android.provider.BaseColumns; -import androidx.annotation.Nullable; import com.google.common.base.Objects; import com.google.common.base.Splitter; import com.google.common.base.Strings; @@ -42,6 +41,7 @@ import okhttp3.HttpUrl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java index 1ce67d9..58e29db 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java @@ -35,7 +35,6 @@ import android.view.View; import android.widget.TextView; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.core.content.pm.ShortcutInfoCompat; import androidx.core.content.pm.ShortcutManagerCompat; @@ -64,6 +63,7 @@ import okhttp3.HttpUrl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.File; import java.net.HttpURLConnection; diff --git a/oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java b/oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java index 57693fa..f539e8e 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java +++ b/oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java @@ -29,12 +29,12 @@ import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.ProgressBar; import android.widget.TextView; -import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import de.schildbach.oeffi.R; import de.schildbach.oeffi.network.NetworkResources; import okhttp3.Call; +import javax.annotation.Nullable; import java.util.Date; public class PlanViewHolder extends RecyclerView.ViewHolder { diff --git a/oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java b/oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java index bbf2b66..4e5debd 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java +++ b/oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java @@ -26,7 +26,6 @@ import android.os.Handler; import android.provider.BaseColumns; import android.view.LayoutInflater; import android.view.ViewGroup; -import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import de.schildbach.oeffi.Constants; import de.schildbach.oeffi.R; @@ -39,6 +38,7 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; +import javax.annotation.Nullable; import java.io.File; import java.io.IOException; import java.util.Date; diff --git a/oeffi/src/de/schildbach/oeffi/preference/AboutFragment.java b/oeffi/src/de/schildbach/oeffi/preference/AboutFragment.java index 9f30553..8fb27e2 100644 --- a/oeffi/src/de/schildbach/oeffi/preference/AboutFragment.java +++ b/oeffi/src/de/schildbach/oeffi/preference/AboutFragment.java @@ -24,11 +24,12 @@ import android.os.Build; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceFragment; -import androidx.annotation.Nullable; import de.schildbach.oeffi.Application; import de.schildbach.oeffi.R; import de.schildbach.oeffi.util.Installer; +import javax.annotation.Nullable; + public class AboutFragment extends PreferenceFragment { private static final String KEY_ABOUT_VERSION = "about_version"; private static final String KEY_ABOUT_MARKET_APP = "about_market_app"; diff --git a/oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java b/oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java index a1bc3ec..cd73015 100644 --- a/oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java +++ b/oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java @@ -20,9 +20,10 @@ package de.schildbach.oeffi.preference; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceFragment; -import androidx.annotation.Nullable; import de.schildbach.oeffi.R; +import javax.annotation.Nullable; + public class CommonFragment extends PreferenceFragment { private static final String KEY_BATTERY_OPTIMIZATIONS = "battery_optimizations"; diff --git a/oeffi/src/de/schildbach/oeffi/preference/DirectionsFragment.java b/oeffi/src/de/schildbach/oeffi/preference/DirectionsFragment.java index cdb06ac..2706ad3 100644 --- a/oeffi/src/de/schildbach/oeffi/preference/DirectionsFragment.java +++ b/oeffi/src/de/schildbach/oeffi/preference/DirectionsFragment.java @@ -19,9 +19,10 @@ package de.schildbach.oeffi.preference; import android.os.Bundle; import android.preference.PreferenceFragment; -import androidx.annotation.Nullable; import de.schildbach.oeffi.R; +import javax.annotation.Nullable; + public class DirectionsFragment extends PreferenceFragment { @Override public void onCreate(@Nullable Bundle savedInstanceState) { diff --git a/oeffi/src/de/schildbach/oeffi/preference/DonateFragment.java b/oeffi/src/de/schildbach/oeffi/preference/DonateFragment.java index 4b29fc6..890c797 100644 --- a/oeffi/src/de/schildbach/oeffi/preference/DonateFragment.java +++ b/oeffi/src/de/schildbach/oeffi/preference/DonateFragment.java @@ -21,9 +21,10 @@ import android.content.ActivityNotFoundException; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceFragment; -import androidx.annotation.Nullable; import de.schildbach.oeffi.R; +import javax.annotation.Nullable; + public class DonateFragment extends PreferenceFragment { private static final String KEY_ABOUT_DONATE_BITCOIN = "about_donate_bitcoin"; diff --git a/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java index 37416e7..87ea4ed 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java @@ -25,7 +25,6 @@ import android.os.Bundle; import android.view.View; import android.widget.ViewAnimator; import androidx.activity.result.contract.ActivityResultContract; -import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import de.schildbach.oeffi.MyActionBar; @@ -39,6 +38,7 @@ import de.schildbach.pte.NetworkId; import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.Location; +import javax.annotation.Nullable; import java.util.List; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/oeffi/src/de/schildbach/oeffi/stations/Station.java b/oeffi/src/de/schildbach/oeffi/stations/Station.java index 52b5c07..9853707 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/Station.java +++ b/oeffi/src/de/schildbach/oeffi/stations/Station.java @@ -17,7 +17,6 @@ package de.schildbach.oeffi.stations; -import androidx.annotation.Nullable; import de.schildbach.pte.NetworkId; import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.LineDestination; @@ -25,6 +24,7 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.Product; import de.schildbach.pte.dto.QueryDeparturesResult; +import javax.annotation.Nullable; import java.util.Date; import java.util.EnumSet; import java.util.List; diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java index 7bd2bce..c0c30e0 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java @@ -38,7 +38,6 @@ import android.view.WindowManager; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.ViewAnimator; -import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.google.common.base.Joiner; @@ -65,6 +64,7 @@ import org.osmdroid.util.GeoPoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java index d72bae2..2596490 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java @@ -55,7 +55,6 @@ import android.widget.TextView; import android.widget.ViewAnimator; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; @@ -100,6 +99,7 @@ import org.osmdroid.util.GeoPoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java b/oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java index 45619c1..ece643e 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java +++ b/oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java @@ -24,13 +24,14 @@ import android.net.Uri; import android.provider.BaseColumns; import android.view.LayoutInflater; import android.view.ViewGroup; -import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import de.schildbach.oeffi.R; import de.schildbach.oeffi.stations.FavoriteStationsProvider; import de.schildbach.pte.NetworkId; import de.schildbach.pte.dto.Location; +import javax.annotation.Nullable; + public class FavoriteStationsAdapter extends RecyclerView.Adapter { private final Context context; private final ContentResolver contentResolver; diff --git a/oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java b/oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java index 3902e63..051aace 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java +++ b/oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java @@ -17,11 +17,11 @@ package de.schildbach.oeffi.stations.list; -import androidx.annotation.Nullable; import de.schildbach.pte.NetworkId; import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.Location; +import javax.annotation.Nullable; import java.util.List; public interface StationContextMenuItemListener { diff --git a/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java b/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java index 015e467..3bfe3ea 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java +++ b/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java @@ -30,7 +30,6 @@ import android.view.WindowManager; import android.widget.ImageButton; import android.widget.PopupMenu; import android.widget.TextView; -import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import com.google.common.base.Joiner; import de.schildbach.oeffi.Constants; @@ -50,6 +49,7 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.Product; import de.schildbach.pte.dto.QueryDeparturesResult; +import javax.annotation.Nullable; import java.util.Date; import java.util.LinkedHashMap; import java.util.LinkedList; diff --git a/oeffi/src/de/schildbach/oeffi/util/Downloader.java b/oeffi/src/de/schildbach/oeffi/util/Downloader.java index d03b094..b35a6a1 100644 --- a/oeffi/src/de/schildbach/oeffi/util/Downloader.java +++ b/oeffi/src/de/schildbach/oeffi/util/Downloader.java @@ -17,7 +17,6 @@ package de.schildbach.oeffi.util; -import androidx.annotation.Nullable; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.Striped; @@ -33,6 +32,7 @@ import okhttp3.ResponseBody; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; From 1d4fd6e102a621d6253684919821a1e038e233f9 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 29 Mar 2023 10:29:14 +0200 Subject: [PATCH 010/111] NetworkProviderFactory: update custom API base for GVH --- .../src/de/schildbach/oeffi/network/NetworkProviderFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index 01242ba..2b16ff5 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -131,7 +131,7 @@ public final class NetworkProviderFactory { else if (networkId.equals(NetworkId.SH)) return new ShProvider("{\"aid\":\"r0Ot9FLFNAFxijLW\",\"type\":\"AID\"}"); else if (networkId.equals(NetworkId.GVH)) - return new GvhProvider(HttpUrl.parse("https://www.efa.de/app_oeffi/")); + return new GvhProvider(HttpUrl.parse("https://gvh.efa.de/app_oeffi/")); else if (networkId.equals(NetworkId.BSVAG)) return new BsvagProvider(); else if (networkId.equals(NetworkId.VBN)) From 766d5c01504c642e4a03982dd6924e1d5e01a906 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 29 Mar 2023 10:43:06 +0200 Subject: [PATCH 011/111] 12.1.10 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 3c55827..34493d4 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="120109" - android:versionName="12.1.9"> + android:versionCode="120110" + android:versionName="12.1.10"> Date: Wed, 29 Mar 2023 14:17:05 +0200 Subject: [PATCH 012/111] .gitlab-ci.yml: merge `apt-get install` commands --- .gitlab-ci.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a66944..00b27b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,8 +11,7 @@ after_script: bullseye-jdk11: image: debian:bullseye-backports script: - - apt-get -y install openjdk-11-jdk-headless - - apt-get -y install sdkmanager gradle + - apt-get -y install openjdk-11-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace artifacts: @@ -23,8 +22,7 @@ bullseye-jdk11: bookworm-jdk17: image: debian:bookworm-slim script: - - apt-get -y install openjdk-17-jdk-headless - - apt-get -y install sdkmanager gradle + - apt-get -y install openjdk-17-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace artifacts: @@ -35,8 +33,7 @@ bookworm-jdk17: jammy-jdk11: image: ubuntu:jammy script: - - apt-get -y install openjdk-11-jdk-headless - - apt-get -y install sdkmanager gradle + - apt-get -y install openjdk-11-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace artifacts: @@ -47,8 +44,7 @@ jammy-jdk11: lunar-jdk17: image: ubuntu:lunar script: - - apt-get -y install openjdk-17-jdk-headless - - apt-get -y install sdkmanager gradle + - apt-get -y install openjdk-17-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace artifacts: From 1c353469cd5216d6bbabdbd61f2bcb78c67bab11 Mon Sep 17 00:00:00 2001 From: Julius Babies Date: Fri, 21 Apr 2023 08:56:22 +0000 Subject: [PATCH 013/111] StationDetailsActivity: use german translation "Gleis" only for trains, otherwise use "Steig" --- oeffi/res/values-de/strings.xml | 3 ++- oeffi/res/values/strings.xml | 1 + .../oeffi/stations/StationDetailsActivity.java | 16 +++++++++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/oeffi/res/values-de/strings.xml b/oeffi/res/values-de/strings.xml index 84e65fb..127f511 100644 --- a/oeffi/res/values-de/strings.xml +++ b/oeffi/res/values-de/strings.xml @@ -355,6 +355,7 @@ %1$dh %2$02d min - Gleis %s + Gleis %s + Steig %s diff --git a/oeffi/res/values/strings.xml b/oeffi/res/values/strings.xml index f74e815..5280af0 100644 --- a/oeffi/res/values/strings.xml +++ b/oeffi/res/values/strings.xml @@ -357,6 +357,7 @@ %1$dh %2$02d min + platform %s platform %s diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java index c0c30e0..3036182 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java @@ -58,6 +58,7 @@ import de.schildbach.pte.dto.Line; import de.schildbach.pte.dto.LineDestination; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; +import de.schildbach.pte.dto.Product; import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.dto.StationDepartures; import org.osmdroid.util.GeoPoint; @@ -69,6 +70,7 @@ import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; import java.util.Date; +import java.util.EnumSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; @@ -693,9 +695,17 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa itemView.setOnClickListener(null); } - // position - positionView.setText(departure.position != null ? Constants.DESTINATION_ARROW_INVISIBLE_PREFIX - + context.getString(R.string.position_platform, departure.position) : null); + // position: use german translation "Gleis" only for trains, otherwise use "Steig" + boolean isTrain = departure.line.product != null && + EnumSet.of(Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, + Product.SUBWAY).contains(departure.line.product); + positionView.setText(departure.position != null ? + Constants.DESTINATION_ARROW_INVISIBLE_PREFIX + + context.getString(isTrain ? + R.string.position_platform_train : + R.string.position_platform, + departure.position) : + null); // capacity final int[] capacity = departure.capacity; From a866d66f6cd46e4569e055e9cc22a9b3a4608d2e Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 29 Aug 2023 19:04:42 +0200 Subject: [PATCH 014/111] settings.gradle: disable lint for good --- oeffi/build.gradle | 1 - settings.gradle | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 47e7cf5..442772a 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -87,7 +87,6 @@ android { lintOptions { abortOnError false - disable 'MissingTranslation' } packagingOptions { diff --git a/settings.gradle b/settings.gradle index eae264c..930ac5a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,5 +8,9 @@ def maxGradleVersion = GradleVersion.version("7.0") // excluding if (GradleVersion.current() < minGradleVersion || GradleVersion.current() >= maxGradleVersion) throw new GradleScriptException("build requires Gradle between ${minGradleVersion.version} (including) and ${maxGradleVersion.version} (excluding)", null) +gradle.startParameter.excludedTaskNames << "lint" +gradle.startParameter.excludedTaskNames << ":oeffi:lintVitalAospRelease" +gradle.startParameter.excludedTaskNames << ":oeffi:lintVitalGoogleRelease" + include 'oeffi' include 'public-transport-enabler' From 89fa32ef567f05344cb68c319d30789bbcd39d15 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 7 Jan 2022 15:35:53 +0100 Subject: [PATCH 015/111] build.Containerfile: reproducible reference build via docker/podman --- .dockerignore | 5 +++++ build.Containerfile | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 .dockerignore create mode 100644 build.Containerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..63ab206 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +**/.* +**/build.Containerfile +**/local.properties +**/build +**/*.iml diff --git a/build.Containerfile b/build.Containerfile new file mode 100644 index 0000000..45c9cb5 --- /dev/null +++ b/build.Containerfile @@ -0,0 +1,39 @@ +# +# Reproducible reference build +# +# Usage: +# docker build --file build.Containerfile --output . +# or +# podman build --file build.Containerfile --output . +# +# The unsigned APKs are written to the specified output directory. +# Use `apksigner` to sign before installing via `adb install`. +# + +FROM debian:bullseye-backports AS build-stage + +# install debian packages +ENV DEBIAN_FRONTEND noninteractive +RUN /usr/bin/apt-get update && \ + /usr/bin/apt-get --yes install openjdk-11-jdk-headless gradle sdkmanager && \ + /bin/ln -fs /usr/share/zoneinfo/CET /etc/localtime && \ + /usr/sbin/dpkg-reconfigure --frontend noninteractive tzdata && \ + /usr/sbin/adduser --disabled-login --gecos "" builder + +# give up privileges +USER builder + +# copy source code +WORKDIR /home/builder +COPY --chown=builder / . + +# accept SDK licenses +ENV ANDROID_HOME /home/builder/android-sdk +RUN yes | /usr/bin/sdkmanager --licenses >/dev/null + +# build +RUN /usr/bin/gradle --no-build-cache --no-daemon --no-parallel clean :oeffi:assembleRelease + +# export build output +FROM scratch AS export-stage +COPY --from=build-stage /home/builder/oeffi/build/outputs/apk/*/release/oeffi-*-release-unsigned.apk / From ed00894f882328fd0472a3820d36e94a65c9fa04 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 29 Aug 2023 23:06:21 +0200 Subject: [PATCH 016/111] 12.1.11 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 34493d4..8daa75f 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="120110" - android:versionName="12.1.10"> + android:versionCode="120111" + android:versionName="12.1.11"> Date: Thu, 31 Aug 2023 13:29:43 +0200 Subject: [PATCH 017/111] build.Containerfile: use a project subdirectory --- build.Containerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.Containerfile b/build.Containerfile index 45c9cb5..4a03556 100644 --- a/build.Containerfile +++ b/build.Containerfile @@ -23,17 +23,17 @@ RUN /usr/bin/apt-get update && \ # give up privileges USER builder -# copy source code +# copy project source code WORKDIR /home/builder -COPY --chown=builder / . +COPY --chown=builder / project/ # accept SDK licenses ENV ANDROID_HOME /home/builder/android-sdk RUN yes | /usr/bin/sdkmanager --licenses >/dev/null -# build -RUN /usr/bin/gradle --no-build-cache --no-daemon --no-parallel clean :oeffi:assembleRelease +# build project +RUN /usr/bin/gradle --project-dir project/ --no-build-cache --no-daemon --no-parallel clean :oeffi:assembleRelease # export build output FROM scratch AS export-stage -COPY --from=build-stage /home/builder/oeffi/build/outputs/apk/*/release/oeffi-*-release-unsigned.apk / +COPY --from=build-stage /home/builder/project/oeffi/build/outputs/apk/*/release/oeffi-*-release-unsigned.apk / From 843edcb001fea22045df35e17d47dde8e3d3acc1 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 4 Sep 2023 01:03:16 +0200 Subject: [PATCH 018/111] build.Containerfile: use disorderfs to improve build reproducibility --- build.Containerfile | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/build.Containerfile b/build.Containerfile index 4a03556..0774630 100644 --- a/build.Containerfile +++ b/build.Containerfile @@ -1,13 +1,17 @@ # -# Reproducible reference build -# # Usage: +# # docker build --file build.Containerfile --output . # or # podman build --file build.Containerfile --output . # -# The unsigned APKs are written to the specified output directory. -# Use `apksigner` to sign before installing via `adb install`. +# For improved reproducibility, the project directory entries can be ordered +# like this: +# +# buildah build --cap-add=sys_admin --device /dev/fuse --file build.Containerfile --output . +# +# In any case, the unsigned APKs are written to the specified output +# directory. Use `apksigner` to sign before installing via `adb install`. # FROM debian:bullseye-backports AS build-stage @@ -15,9 +19,10 @@ FROM debian:bullseye-backports AS build-stage # install debian packages ENV DEBIAN_FRONTEND noninteractive RUN /usr/bin/apt-get update && \ - /usr/bin/apt-get --yes install openjdk-11-jdk-headless gradle sdkmanager && \ + /usr/bin/apt-get --yes install disorderfs openjdk-11-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 && \ /usr/sbin/adduser --disabled-login --gecos "" builder # give up privileges @@ -32,7 +37,14 @@ ENV ANDROID_HOME /home/builder/android-sdk RUN yes | /usr/bin/sdkmanager --licenses >/dev/null # build project -RUN /usr/bin/gradle --project-dir project/ --no-build-cache --no-daemon --no-parallel clean :oeffi:assembleRelease +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 && \ + /usr/bin/gradle --project-dir project/ --no-build-cache --no-daemon --no-parallel clean :oeffi:assembleRelease && \ + if [ -e /dev/fuse ] ; \ + then /bin/fusermount -u project | true && /bin/rmdir project && /bin/mv project.u project ; \ + fi # export build output FROM scratch AS export-stage From 5c6aef0591bf9d89627af740cc96afca2742d131 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 31 Aug 2023 15:44:31 +0200 Subject: [PATCH 019/111] proguard.cfg: remove an option that is the default anyway --- oeffi/proguard.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/oeffi/proguard.cfg b/oeffi/proguard.cfg index 1566d6d..e568fbd 100644 --- a/oeffi/proguard.cfg +++ b/oeffi/proguard.cfg @@ -1,4 +1,3 @@ --dontskipnonpubliclibraryclasses -dontoptimize -dontpreverify -dontobfuscate From 4bdb3598c38b639a15f63bb3daa4bf0e268740c9 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 31 Aug 2023 15:50:36 +0200 Subject: [PATCH 020/111] proguard.cfg: declare this is an Android project --- oeffi/proguard.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/oeffi/proguard.cfg b/oeffi/proguard.cfg index e568fbd..265fb16 100644 --- a/oeffi/proguard.cfg +++ b/oeffi/proguard.cfg @@ -1,3 +1,4 @@ +-android -dontoptimize -dontpreverify -dontobfuscate From 18415177bd9b3b2e535f590489b6f689429c7e8a Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 4 Sep 2023 11:36:24 +0200 Subject: [PATCH 021/111] 12.1.12 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 8daa75f..a2aac62 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="120111" - android:versionName="12.1.11"> + android:versionCode="120112" + android:versionName="12.1.12"> Date: Mon, 4 Sep 2023 20:43:16 +0200 Subject: [PATCH 022/111] build.gradle: update AndroidX Activity to 1.7.2 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 442772a..48d687c 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -18,7 +18,7 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' implementation 'androidx.core:core:1.9.0' - implementation 'androidx.activity:activity:1.7.0' + implementation 'androidx.activity:activity:1.7.2' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.13' //noinspection GradleDependency From ef47708d0bf8ad1cab9a65f7a1d630ad0a19096e Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 4 Sep 2023 20:44:36 +0200 Subject: [PATCH 023/111] build.gradle: update AndroidX RecyclerView to 1.3.2 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 48d687c..6f17c88 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -14,7 +14,7 @@ configurations { dependencies { implementation project(':public-transport-enabler') implementation 'androidx.annotation:annotation:1.5.0' - implementation 'androidx.recyclerview:recyclerview:1.3.0' + implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' implementation 'androidx.core:core:1.9.0' From 5e3204c796113745e3fb8d3f0838a62d2b0b0fcc Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 31 Oct 2023 12:34:35 +0100 Subject: [PATCH 024/111] build.gradle: update AndroidX Activity to 1.8.0 --- oeffi/build.gradle | 2 +- oeffi/proguard.cfg | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 6f17c88..03b013d 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -18,7 +18,7 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' implementation 'androidx.core:core:1.9.0' - implementation 'androidx.activity:activity:1.7.2' + implementation 'androidx.activity:activity:1.8.0' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.13' //noinspection GradleDependency diff --git a/oeffi/proguard.cfg b/oeffi/proguard.cfg index 265fb16..ef8b6c0 100644 --- a/oeffi/proguard.cfg +++ b/oeffi/proguard.cfg @@ -53,6 +53,9 @@ -dontnote kotlin.** -dontnote kotlinx.** -dontwarn androidx.lifecycle.SavedStateHandle +-dontwarn androidx.activity.Api34Impl +-dontwarn androidx.activity.BackEventCompat +-dontwarn androidx.**$Api34Impl$** # OkHttp -dontwarn okio.DeflaterSink From 45e213b14a4ecb5697dfd38f4fa562f451eb86ec Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 31 Oct 2023 12:36:41 +0100 Subject: [PATCH 025/111] build.gradle: update AndroidX Annotation to 1.7.0 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 03b013d..7b8990b 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -13,7 +13,7 @@ configurations { dependencies { implementation project(':public-transport-enabler') - implementation 'androidx.annotation:annotation:1.5.0' + implementation 'androidx.annotation:annotation:1.7.0' implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' From 7ac8f6280cfa1362c1907db076574171e5c5d244 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 31 Oct 2023 12:49:51 +0100 Subject: [PATCH 026/111] build.gradle: update AndroidX Core to 1.12.0 --- oeffi/build.gradle | 2 +- oeffi/proguard.cfg | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 7b8990b..55ba4b4 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -17,7 +17,7 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' - implementation 'androidx.core:core:1.9.0' + implementation 'androidx.core:core:1.12.0' implementation 'androidx.activity:activity:1.8.0' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.13' diff --git a/oeffi/proguard.cfg b/oeffi/proguard.cfg index ef8b6c0..5ca66d9 100644 --- a/oeffi/proguard.cfg +++ b/oeffi/proguard.cfg @@ -55,7 +55,8 @@ -dontwarn androidx.lifecycle.SavedStateHandle -dontwarn androidx.activity.Api34Impl -dontwarn androidx.activity.BackEventCompat --dontwarn androidx.**$Api34Impl$** +-dontwarn androidx.core.view.accessibility.AccessibilityNodeInfoCompat$AccessibilityActionCompat +-dontwarn androidx.**$Api34Impl,androidx.**$Api34Impl$** # OkHttp -dontwarn okio.DeflaterSink From b4503f1decef038988ba888ffe4cb620b12ce269 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 31 Oct 2023 12:51:38 +0100 Subject: [PATCH 027/111] build.gradle: update SLF4J to 2.0.9 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 55ba4b4..4fff936 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation 'com.squareup.okhttp3:logging-interceptor:3.12.13' implementation 'com.google.guava:guava:31.1-android' implementation 'org.osmdroid:osmdroid-android:6.1.14' - implementation 'org.slf4j:slf4j-api:2.0.7' + implementation 'org.slf4j:slf4j-api:2.0.9' implementation 'com.github.tony19:logback-android:3.0.0' testImplementation 'junit:junit:4.13.2' } From 54ce45291a2bf5d439e14ccaa8b74e305ac01c84 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 31 Oct 2023 16:12:17 +0100 Subject: [PATCH 028/111] build.gradle: update SDK Build Tools to 34.0.0 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 4fff936..c4ae1a7 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -32,7 +32,7 @@ dependencies { android { compileSdkVersion 'android-33' - buildToolsVersion '33.0.2' + buildToolsVersion '34.0.0' defaultConfig { generatedDensities = ['hdpi', 'xhdpi'] From a4a57747780bd3d5dd29d91d3dad0d0dac3e1360 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 31 Oct 2023 16:45:56 +0100 Subject: [PATCH 029/111] .gitlab-ci.yml: inline `before_script` and `after_script` into `script` blocks --- .gitlab-ci.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00b27b2..36aae19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,18 +2,14 @@ variables: GIT_SUBMODULE_STRATEGY: recursive ANDROID_HOME: $PWD/android-sdk -before_script: - - apt-get update - -after_script: - - gradle --version - bullseye-jdk11: image: debian:bullseye-backports script: + - apt-get update - apt-get -y install openjdk-11-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + - gradle --version artifacts: name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA paths: @@ -22,9 +18,11 @@ bullseye-jdk11: bookworm-jdk17: image: debian:bookworm-slim script: + - apt-get update - apt-get -y install openjdk-17-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + - gradle --version artifacts: name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA paths: @@ -33,9 +31,11 @@ bookworm-jdk17: jammy-jdk11: image: ubuntu:jammy script: + - apt-get update - apt-get -y install openjdk-11-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + - gradle --version artifacts: name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA paths: @@ -44,9 +44,11 @@ jammy-jdk11: lunar-jdk17: image: ubuntu:lunar script: + - apt-get update - apt-get -y install openjdk-17-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + - gradle --version artifacts: name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA paths: From 9524f77e1024760493ed7cf4f2a7e407b18dc7d7 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 31 Oct 2023 16:49:43 +0100 Subject: [PATCH 030/111] .gitlab-ci.yml: add job for reference build --- .gitlab-ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36aae19..f04863e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,23 @@ variables: GIT_SUBMODULE_STRATEGY: recursive ANDROID_HOME: $PWD/android-sdk +reference: + image: debian:bookworm-slim + before_script: + - apt-get update + - apt-get -y install ca-certificates buildah + # switch to iptables legacy, as GitLab CI doesn't support nftables + - apt-get -y install --no-install-recommends iptables + - update-alternatives --set iptables /usr/sbin/iptables-legacy + script: + - buildah build --file build.Containerfile --output build . + after_script: + - sha256sum build/* + artifacts: + name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA + paths: + - build/** + bullseye-jdk11: image: debian:bullseye-backports script: From 7c09e85f76685176e721388832ce4cf483491a62 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 31 Oct 2023 17:02:13 +0100 Subject: [PATCH 031/111] 12.1.13 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index a2aac62..909e51d 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="120112" - android:versionName="12.1.12"> + android:versionCode="120113" + android:versionName="12.1.13"> Date: Wed, 1 Nov 2023 14:06:09 +0100 Subject: [PATCH 032/111] AndroidManifest.xml: target Android 14 --- oeffi/AndroidManifest.xml | 2 +- oeffi/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 909e51d..ddf7587 100644 --- a/oeffi/AndroidManifest.xml +++ b/oeffi/AndroidManifest.xml @@ -25,7 +25,7 @@ + android:targetSdkVersion="34" /> diff --git a/oeffi/build.gradle b/oeffi/build.gradle index c4ae1a7..1a376d2 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -31,7 +31,7 @@ dependencies { } android { - compileSdkVersion 'android-33' + compileSdkVersion 'android-34' buildToolsVersion '34.0.0' defaultConfig { From 1eda102dc023d831c3ac724afe25c0b864eac0e2 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 5 Nov 2023 21:40:22 +0100 Subject: [PATCH 033/111] networks.txt: remove TFI (Ireland) --- oeffi/assets/networks.txt | 3 --- oeffi/res/values-de/networks.xml | 2 -- oeffi/res/values/networks.xml | 2 -- oeffi/src/de/schildbach/oeffi/Application.java | 6 ++++++ .../de/schildbach/oeffi/network/NetworkProviderFactory.java | 3 --- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt index 0294826..dca04bd 100644 --- a/oeffi/assets/networks.txt +++ b/oeffi/assets/networks.txt @@ -83,9 +83,6 @@ FINLAND|fi-FI|FI;Helsinki|beta 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 -# IE -TFI|ga-IE|IE;Dublin;GB;Belfast - # AE DUB|ae-AE|AE;Dubai|beta diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml index 16f6bc2..0852204 100644 --- a/oeffi/res/values-de/networks.xml +++ b/oeffi/res/values-de/networks.xml @@ -109,8 +109,6 @@ Lokal- und Regionalverkehr (z.B. London, Birmingham) Liverpool Lokal- und Regionalverkehr - Irland & Nordirland - Lokal- und Regionalverkehr Dubai Lokalverkehr San Francisco diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml index d2b02f6..d546bcc 100644 --- a/oeffi/res/values/networks.xml +++ b/oeffi/res/values/networks.xml @@ -109,8 +109,6 @@ local and regional (e.g. London, Birmingham) Liverpool local and regional - Ireland & Northern Ireland - local and regional Dubai local San Francisco diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java index b3e3796..492c138 100644 --- a/oeffi/src/de/schildbach/oeffi/Application.java +++ b/oeffi/src/de/schildbach/oeffi/Application.java @@ -109,6 +109,12 @@ public class Application extends android.app.Application { FavoriteStationsProvider.migrateFavoriteStations(this, VMS, NetworkId.VVO); QueryHistoryProvider.migrateQueryHistory(this, VMS, NetworkId.VVO); + // 2023-11-05: migrate TFI to use RT + final String TFI = "TFI"; + migrateSelectedNetwork(TFI, NetworkId.RT); + FavoriteStationsProvider.deleteFavoriteStations(this, TFI); + QueryHistoryProvider.deleteQueryHistory(this, TFI); + log.info("Migrations took {}", watch); } diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index 2b16ff5..83c6e76 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -59,7 +59,6 @@ import de.schildbach.pte.SncbProvider; import de.schildbach.pte.SpainProvider; import de.schildbach.pte.StvProvider; import de.schildbach.pte.SydneyProvider; -import de.schildbach.pte.TfiProvider; import de.schildbach.pte.TlemProvider; import de.schildbach.pte.VbbProvider; import de.schildbach.pte.VblProvider; @@ -200,8 +199,6 @@ public final class NetworkProviderFactory { return new TlemProvider(); else if (networkId.equals(NetworkId.MERSEY)) return new MerseyProvider(); - else if (networkId.equals(NetworkId.TFI)) - return new TfiProvider(); else if (networkId.equals(NetworkId.DUB)) return new DubProvider(); else if (networkId.equals(NetworkId.BART)) From 80daf5c5c6f2e90101b1e13e7a4221ce86914795 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 5 Nov 2023 21:51:25 +0100 Subject: [PATCH 034/111] build.gradle: update Guava to 32.1.3-android --- oeffi/build.gradle | 2 +- oeffi/proguard.cfg | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 1a376d2..0f038e4 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -23,7 +23,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:31.1-android' + implementation 'com.google.guava:guava:32.1.3-android' implementation 'org.osmdroid:osmdroid-android:6.1.14' implementation 'org.slf4j:slf4j-api:2.0.9' implementation 'com.github.tony19:logback-android:3.0.0' diff --git a/oeffi/proguard.cfg b/oeffi/proguard.cfg index 5ca66d9..8253ee2 100644 --- a/oeffi/proguard.cfg +++ b/oeffi/proguard.cfg @@ -71,15 +71,16 @@ # Guava -dontwarn sun.misc.Unsafe --dontwarn java.lang.ClassValue --dontwarn com.google.errorprone.annotations.** --dontwarn afu.org.checkerframework.checker.**,org.checkerframework.checker.** +-dontwarn javax.lang.model.element.Modifier +-dontwarn com.google.common.reflect.Invokable,com.google.common.reflect.Invokable$** +-dontwarn java.lang.reflect.AnnotatedType -dontnote com.google.common.reflect.** -dontnote com.google.appengine.** -dontnote com.google.apphosting.** -dontnote com.google.common.cache.Striped64,com.google.common.cache.Striped64$Cell -dontnote com.google.common.hash.Striped64,com.google.common.hash.Striped64$Cell -dontnote com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper +-dontnote com.google.common.io.TempFileCreator,com.google.common.io.TempFileCreator$** -dontnote dalvik.system.CloseGuard # SLF4J, logback-android From 2754077ccb89258b098a6fd23d8ba81fcc80a9bb Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 5 Nov 2023 21:54:00 +0100 Subject: [PATCH 035/111] build.gradle: update osmdroid to 6.1.17 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 0f038e4..f01ecd7 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -24,7 +24,7 @@ dependencies { //noinspection GradleDependency implementation 'com.squareup.okhttp3:logging-interceptor:3.12.13' implementation 'com.google.guava:guava:32.1.3-android' - implementation 'org.osmdroid:osmdroid-android:6.1.14' + implementation 'org.osmdroid:osmdroid-android:6.1.17' implementation 'org.slf4j:slf4j-api:2.0.9' implementation 'com.github.tony19:logback-android:3.0.0' testImplementation 'junit:junit:4.13.2' From 81a89ec9394108b91cdcb8ae65ac143ce1d621aa Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 10 Nov 2023 10:26:44 +0100 Subject: [PATCH 036/111] 12.1.14 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index ddf7587..2401590 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="120113" - android:versionName="12.1.13"> + android:versionCode="120114" + android:versionName="12.1.14"> Date: Tue, 14 Nov 2023 21:39:19 +0100 Subject: [PATCH 037/111] StationDetailsActivity, DecodeForeignActivity: remove deep links from QR codes and NDEF messages Android 12 doesn't support this any more for domains you don't own. --- oeffi/AndroidManifest.xml | 98 -------------- oeffi/res/values-de/strings.xml | 1 - oeffi/res/values/strings.xml | 1 - .../oeffi/stations/DecodeForeignActivity.java | 125 ------------------ .../stations/StationDetailsActivity.java | 88 +----------- 5 files changed, 6 insertions(+), 307 deletions(-) delete mode 100644 oeffi/src/de/schildbach/oeffi/stations/DecodeForeignActivity.java diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 2401590..6021c8a 100644 --- a/oeffi/AndroidManifest.xml +++ b/oeffi/AndroidManifest.xml @@ -117,104 +117,6 @@ android:configChanges="keyboard|keyboardHidden" android:label="@string/station_details_activity_title" android:taskAffinity="de.schildbach.oeffi.stations"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Keine Haltestellen gefunden - Abfahrtszeiten an dieser Haltestelle Favorit Lade Abfahrtszeiten… Keine Abfahrten diff --git a/oeffi/res/values/strings.xml b/oeffi/res/values/strings.xml index 5280af0..4e41937 100644 --- a/oeffi/res/values/strings.xml +++ b/oeffi/res/values/strings.xml @@ -136,7 +136,6 @@ No stations found - Departure times of this station Favorite Loading departures… No departures diff --git a/oeffi/src/de/schildbach/oeffi/stations/DecodeForeignActivity.java b/oeffi/src/de/schildbach/oeffi/stations/DecodeForeignActivity.java deleted file mode 100644 index 7728cde..0000000 --- a/oeffi/src/de/schildbach/oeffi/stations/DecodeForeignActivity.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package de.schildbach.oeffi.stations; - -import android.app.ProgressDialog; -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import androidx.activity.ComponentActivity; -import de.schildbach.oeffi.Application; -import de.schildbach.oeffi.R; -import de.schildbach.oeffi.util.DialogBuilder; -import de.schildbach.pte.NetworkId; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.HttpUrl; -import okhttp3.Request; -import okhttp3.Response; - -import java.io.IOException; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class DecodeForeignActivity extends ComponentActivity { - private static final Pattern PATTERN_META_REFRESH = Pattern - .compile(" finish()); - progressDialog.setCanceledOnTouchOutside(false); - - final Request.Builder request = new Request.Builder(); - request.url(HttpUrl.parse(uri.toString())); - final Call call = application.okHttpClient().newCall(request.build()); - call.enqueue(new Callback() { - public void onResponse(final Call call, final Response r) throws IOException { - try (final Response response = r) { - if (response.isSuccessful()) { - final Matcher mRefresh = PATTERN_META_REFRESH.matcher(response.body().string()); - if (mRefresh.find()) { - final Uri refreshUri = Uri.parse(mRefresh.group(1)); - - runOnUiThread(() -> { - progressDialog.dismiss(); - if ("mobil.rmv.de".equals(refreshUri.getHost()) - && "/mobile".equals(refreshUri.getPath())) { - final String id = refreshUri.getQueryParameter("id"); - StationDetailsActivity.start(DecodeForeignActivity.this, - NetworkId.NVV, new Location(LocationType.STATION, id)); - finish(); - } else { - errorDialog(R.string.stations_decode_foreign_failed); - } - }); - } else { - onFail(); - } - } else { - onFail(); - } - } - } - - public void onFailure(final Call call, final IOException x) { - onFail(); - } - - private void onFail() { - runOnUiThread(() -> { - progressDialog.dismiss(); - errorDialog(R.string.stations_decode_foreign_failed); - }); - } - }); - } else { - throw new IllegalArgumentException("cannot handle path: '" + path + "'"); - } - } else { - throw new IllegalArgumentException("cannot handle host: '" + host + "'"); - } - } - } - - private void errorDialog(final int resId) { - final DialogBuilder builder = DialogBuilder.warn(this, 0); - builder.setMessage(resId); - builder.setPositiveButton("Ok", (dialog, which) -> finish()); - builder.setOnCancelListener(dialog -> finish()); - builder.show(); - } -} diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java index 3036182..4ff6e10 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java @@ -75,8 +75,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -195,86 +193,12 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa resultStatusView = findViewById(R.id.stations_station_details_result_status); final Intent intent = getIntent(); - final Uri uri = intent.getData(); - - if (uri != null && uri.getScheme().equals("http")) { - log.info("Got intent: {}", intent); - - final String host = uri.getHost(); - final String path = uri.getPath().trim(); - - if ("oeffi.schildbach.de".equals(host)) { - final NetworkId network = NetworkId.valueOf(uri.getQueryParameter("network").toUpperCase()); - final String stationId = uri.getQueryParameter("id"); - selectStation(new Station(network, new Location(LocationType.STATION, stationId, null, null))); - } else if ("qr.bvg.de".equals(host)) { - final Matcher m = Pattern.compile("/h(\\d+)").matcher(path); - if (m.matches()) { - final NetworkId network = NetworkId.BVG; - String stationId = bvgStationIdNfcToQr(m.group(1)); - if (stationId.length() <= 6) // mast - stationId = '~' + stationId; - selectStation(new Station(network, new Location(LocationType.STATION, stationId, null, null))); - } else { - throw new IllegalArgumentException("could not parse path: '" + path + "'"); - } - } else if ("mobil.s-bahn-berlin.de".equals(host)) { - if ("/".equals(path)) { - final NetworkId network = NetworkId.VBB; - final String qr = uri.getQueryParameter("QR"); - final String stationId = qr != null ? qr : uri.getQueryParameter("qr"); - selectStation(new Station(network, new Location(LocationType.STATION, stationId, null, null))); - } else { - throw new IllegalArgumentException("could not parse path: '" + path + "'"); - } - } else if ("www.mvg-live.de".equals(host)) { - final Matcher m = Pattern.compile("/qr/(\\d+)-\\d*-\\d*").matcher(path); - if (m.matches()) { - final NetworkId network = NetworkId.MVV; - final String stationId = m.group(1); - selectStation(new Station(network, new Location(LocationType.STATION, stationId, null, null))); - } else { - throw new IllegalArgumentException("could not parse path: '" + path + "'"); - } - } else if ("wap.rmv.de".equals(host)) { - final NetworkId network = NetworkId.NVV; - final String stationId = uri.getQueryParameter("id"); - selectStation(new Station(network, new Location(LocationType.STATION, stationId, null, null))); - } else if ("m.vrn.de".equals(host)) { - final Matcher m = Pattern.compile("/(\\d+)").matcher(path); - if (m.matches()) { - final NetworkId network = NetworkId.VRN; - final String stationId = Integer.toString(Integer.parseInt(m.group(1)) + 6000000); - selectStation(new Station(network, new Location(LocationType.STATION, stationId, null, null))); - } else { - throw new IllegalArgumentException("could not parse path: '" + path + "'"); - } - } else if ("www.rheinbahn.de".equals(host)) { - final Matcher m = Pattern.compile("/QRBarcode/HS/(\\d+)_\\d*.html").matcher(path); - if (m.matches()) { - final NetworkId network = NetworkId.VRR; - final String stationId = Integer.toString(Integer.parseInt(m.group(1)) + 20000000); - selectStation(new Station(network, new Location(LocationType.STATION, stationId, null, null))); - } else { - throw new IllegalArgumentException("could not parse path: '" + path + "'"); - } - } else if ("mobil.vvs.de".equals(host)) { - final NetworkId network = NetworkId.VVS; - final int stationId = Integer.parseInt(uri.getQueryParameter("name_dm")); - // final String lineId = uri.getQueryParameter("line"); - selectStation(new Station(network, new Location(LocationType.STATION, - Integer.toString(stationId < 10000 ? stationId + 5000000 : stationId), null, null))); - } else { - throw new RuntimeException("cannot handle host: '" + host + "'"); - } - } else { - final NetworkId network = (NetworkId) checkNotNull(getIntent().getSerializableExtra(INTENT_EXTRA_NETWORK)); - final Station station = new Station(network, (Location) intent.getSerializableExtra(INTENT_EXTRA_STATION)); - if (intent.hasExtra(INTENT_EXTRA_DEPARTURES)) - station.departures = (List) intent.getSerializableExtra(INTENT_EXTRA_DEPARTURES); - selectStation(station); - statusMessage(getString(R.string.stations_station_details_progress)); - } + final NetworkId network = (NetworkId) checkNotNull(intent.getSerializableExtra(INTENT_EXTRA_NETWORK)); + final Station station = new Station(network, (Location) intent.getSerializableExtra(INTENT_EXTRA_STATION)); + if (intent.hasExtra(INTENT_EXTRA_DEPARTURES)) + station.departures = (List) intent.getSerializableExtra(INTENT_EXTRA_DEPARTURES); + selectStation(station); + statusMessage(getString(R.string.stations_station_details_progress)); favoriteButton .setChecked(selectedFavState != null && selectedFavState == FavoriteStationsProvider.TYPE_FAVORITE); From 843ed0fa7eb349261dcf9a6d9033fdee017f286b Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 16 Nov 2023 16:29:58 +0100 Subject: [PATCH 038/111] networks.txt: migrate `AVV` (EFA) to `AVV_AUGSBURG` (Hafas) --- oeffi/assets/networks.txt | 2 +- oeffi/res/values-de/networks.xml | 4 ++-- oeffi/res/values/networks.xml | 4 ++-- oeffi/src/de/schildbach/oeffi/Application.java | 6 ++++++ .../de/schildbach/oeffi/network/NetworkProviderFactory.java | 6 +++--- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt index dca04bd..d13c8b3 100644 --- a/oeffi/assets/networks.txt +++ b/oeffi/assets/networks.txt @@ -8,7 +8,7 @@ DB|de-DE|DE BVG|de-DE|Brandenburg;Berlin VBB|de-DE|Brandenburg BAYERN|de-DE|Bayern;Würzburg;Regensburg -AVV|de-DE|Augsburg +AVV_AUGSBURG|de-DE|Augsburg MVV|de-DE|Bayern;München INVG|de-DE|Ingolstadt VGN|de-DE|Nürnberg;Fürth;Erlangen diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml index 0852204..750b7e3 100644 --- a/oeffi/res/values-de/networks.xml +++ b/oeffi/res/values-de/networks.xml @@ -19,8 +19,8 @@ Lokal- und Regionalverkehr Ingolstadt Lokal- und Regionalverkehr - Augsburg - nur Tram und Bus + Augsburg + nur Tram und Bus Verkehrsverbund Großraum Nürnberg Nürnberg, Fürth & Erlangen, Lokal- und Regionalverkehr Mittelschwaben (Krumbach, Günzburg, …) diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml index d546bcc..c4202a5 100644 --- a/oeffi/res/values/networks.xml +++ b/oeffi/res/values/networks.xml @@ -18,8 +18,8 @@ local and regional Ingolstadt local and regional - Augsburg - tram and bus only + Augsburg + tram and bus only Verkehrsverbund Großraum Nürnberg Nuremberg, Fürth & Erlangen, local and regional Mittelschwaben (Krumbach, Günzburg, …) diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java index 492c138..c64db6e 100644 --- a/oeffi/src/de/schildbach/oeffi/Application.java +++ b/oeffi/src/de/schildbach/oeffi/Application.java @@ -115,6 +115,12 @@ public class Application extends android.app.Application { FavoriteStationsProvider.deleteFavoriteStations(this, TFI); QueryHistoryProvider.deleteQueryHistory(this, TFI); + // 2023-11-16: migrate AVV to use AVV_AUGSBURG + final String AVV = "AVV"; + migrateSelectedNetwork(AVV, NetworkId.AVV_AUGSBURG); + FavoriteStationsProvider.deleteFavoriteStations(this, AVV); + QueryHistoryProvider.deleteQueryHistory(this, AVV); + log.info("Migrations took {}", watch); } diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index 83c6e76..787cba3 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -21,7 +21,7 @@ import com.google.common.base.Charsets; import com.google.common.io.BaseEncoding; import de.schildbach.pte.AbstractNetworkProvider; import de.schildbach.pte.AvvAachenProvider; -import de.schildbach.pte.AvvProvider; +import de.schildbach.pte.AvvAugsburgProvider; import de.schildbach.pte.BartProvider; import de.schildbach.pte.BayernProvider; import de.schildbach.pte.BsvagProvider; @@ -119,8 +119,8 @@ public final class NetworkProviderFactory { else if (networkId.equals(NetworkId.INVG)) return new InvgProvider("{\"type\":\"AID\",\"aid\":\"GITvwi3BGOmTQ2a5\"}", "ERxotxpwFT7uYRsI".getBytes(Charsets.UTF_8)); - else if (networkId.equals(NetworkId.AVV)) - return new AvvProvider(); + else if (networkId.equals(NetworkId.AVV_AUGSBURG)) + return new AvvAugsburgProvider("{\"type\":\"AID\",\"aid\":\"jK91AVVZU77xY5oH\"}"); else if (networkId.equals(NetworkId.VGN)) return new VgnProvider(HttpUrl.parse("https://efa.vgn.de/vgnExt_oeffi/")); else if (networkId.equals(NetworkId.VVM)) From ab93873c0e412c8874c7ee96a82db397b166a429 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 16 Nov 2023 16:38:42 +0100 Subject: [PATCH 039/111] 12.1.15 --- 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 6021c8a..4c1348c 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="120114" - android:versionName="12.1.14"> + android:versionCode="120115" + android:versionName="12.1.15"> Date: Thu, 16 Nov 2023 17:25:27 +0100 Subject: [PATCH 040/111] build.gradle: update AndroidX Activity to 1.8.1 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index f01ecd7..13d4afa 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -18,7 +18,7 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' implementation 'androidx.core:core:1.12.0' - implementation 'androidx.activity:activity:1.8.0' + implementation 'androidx.activity:activity:1.8.1' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.13' //noinspection GradleDependency From 61c201eb2b7e176374031ddfcbf5d2e1fdddc9c5 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 18 Nov 2023 13:18:21 +0100 Subject: [PATCH 041/111] AndroidManifest.xml: add `BROWSABLE` category to `geo` intent filter --- oeffi/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 4c1348c..28fa2d1 100644 --- a/oeffi/AndroidManifest.xml +++ b/oeffi/AndroidManifest.xml @@ -181,6 +181,7 @@ + From 332f0c06b8691f704dd3bad449217928a495a95b Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 3 Dec 2023 14:27:47 +0100 Subject: [PATCH 042/111] NetworkProviderFactory: remove custom API base for GVH --- .../src/de/schildbach/oeffi/network/NetworkProviderFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index 787cba3..6a6a6d7 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -130,7 +130,7 @@ public final class NetworkProviderFactory { else if (networkId.equals(NetworkId.SH)) return new ShProvider("{\"aid\":\"r0Ot9FLFNAFxijLW\",\"type\":\"AID\"}"); else if (networkId.equals(NetworkId.GVH)) - return new GvhProvider(HttpUrl.parse("https://gvh.efa.de/app_oeffi/")); + return new GvhProvider(); else if (networkId.equals(NetworkId.BSVAG)) return new BsvagProvider(); else if (networkId.equals(NetworkId.VBN)) From 2843f84b45e2faf5bc32f4dd9f7218a66dd787cd Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 3 Dec 2023 16:36:48 +0100 Subject: [PATCH 043/111] 12.1.16 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 28fa2d1..816791a 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="120115" - android:versionName="12.1.15"> + android:versionCode="120116" + android:versionName="12.1.16"> Date: Sat, 16 Dec 2023 20:42:12 +0100 Subject: [PATCH 044/111] build.gradle: update AndroidX Annotation to 1.7.1 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 13d4afa..6f7ae73 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -13,7 +13,7 @@ configurations { dependencies { implementation project(':public-transport-enabler') - implementation 'androidx.annotation:annotation:1.7.0' + implementation 'androidx.annotation:annotation:1.7.1' implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' From 4b710e1aad23767d8db55c8d1e27efd475ab12ad Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 16 Dec 2023 20:46:22 +0100 Subject: [PATCH 045/111] build.gradle: update AndroidX Activity to 1.8.2 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 6f7ae73..ebb28f1 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -18,7 +18,7 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' implementation 'androidx.core:core:1.12.0' - implementation 'androidx.activity:activity:1.8.1' + implementation 'androidx.activity:activity:1.8.2' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.13' //noinspection GradleDependency From bcf34c1de9c56a63c346576069fb50b2112dd303 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 16 Dec 2023 20:48:55 +0100 Subject: [PATCH 046/111] 12.1.17 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 816791a..da34bed 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="120116" - android:versionName="12.1.16"> + android:versionCode="120117" + android:versionName="12.1.17"> Date: Mon, 18 Dec 2023 00:00:17 +0100 Subject: [PATCH 047/111] networks.txt: remove SNCB (Belgium) --- oeffi/assets/networks.txt | 3 --- oeffi/res/drawable-xhdpi/network_sncb_icon.png | Bin 1427 -> 0 bytes oeffi/res/values-de/networks.xml | 2 -- oeffi/res/values/networks.xml | 2 -- oeffi/res/xml/network_security_config.xml | 1 - oeffi/src/de/schildbach/oeffi/Application.java | 6 ++++++ .../oeffi/network/NetworkProviderFactory.java | 3 --- 7 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 oeffi/res/drawable-xhdpi/network_sncb_icon.png diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt index d13c8b3..538933b 100644 --- a/oeffi/assets/networks.txt +++ b/oeffi/assets/networks.txt @@ -61,9 +61,6 @@ PARIS|fr-FR|FR|alpha # ES SPAIN|es-ES|ES|alpha -# BE -SNCB|be-BE|BE|alpha - # LU LU|lb-LU|LU;Luxemburg diff --git a/oeffi/res/drawable-xhdpi/network_sncb_icon.png b/oeffi/res/drawable-xhdpi/network_sncb_icon.png deleted file mode 100644 index 67edda3db943acc68ad2b81e191c08eea461225f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1427 zcmV;E1#J3>P)dpn+a&e{3BXYV=hE4*Jgf4uMeyFB0X z{GQ))`Tf9$4<9~!`0(MwN1CCxw%`ire(lgtdY^Qy4s&XTKpKUw;Q>ZU0CW(?DFA9I zkuYdCJrr_E9GE3LZQ?&n3DBvF$mb6V2vbIngh8JrKsLp4%Ig~FBCF4f^K>$W9n1q@ zB$u7gz#tndd4W;efWD@i^aWu3O`q;!3RvR9EXjloC<15+tC+)O8D&6qJWT*}5@v9} zjqj0$v}!;Bp3tq@L=AHZurs;%0!OWfU=s0Rjc(M6fo`__EulQEW-kjFZ#^#t(4o3Y zFX%_HQ!0WU;&$V?7xO%iM0%I%c1eLkAkjamt63NGp`1EGG>{K8lTR(B(i!Ph!Y*=c z&VPavx$AKdz#BFR zD6-i@;{Qy@G%C8`2R8QxYo0(iK?&Q9Mt6Hg{8t!eDtU-^)0spJD+dB+6o zM57S`@|Oe{#U9tCAFTB$XJithGN#3Wj8hn|TXdpnk{O7}298k(KpPdZ2|(+3)CEm! zppf%)u$6t%mN?0Y$)fZzYJ2N8a#;}+Mi6p!QT;{(FLPQ+Yc~LQ$ zv#wL9mm*TrfIye);$N2{g;bZ2G;*+a7!J8apj{_P9M@)8O;ZFt!PivN#jmt5!Pt77 z!#7-@g>`-FMaJd8zP?b4_{Akn6iIzb1Y!uCq`(ydS0yi%Z8R3kT++bq)cim!=D0*) zgHr@n0@rEGIDs8~ccRn@%mxaXNH#kuWH9-h%m{%Y`lAfoh!wJ!CA<2De%g`rTx{S4 zm)UgDBLm-s;?gSMRhE#GMgqkgkW?I*F@@pGXJeX#UoDkJ`M?0ghxC={kIM9TiKU|f zfxugi3%--yBG<9_rcc#8u~y0rrH`VBpu1Cq)uy~IDs$z9UyXT!~~sEXmZHm^p&#)t1uaj zeVpNa&;Vm>jC9GYO6@2C4ahY8j8@JOWGU0><~Vz0rS*9sZN@h6H}{z}blMLfH-33^ zL|w+|4fmQ2?-M;Fhg~6%G}I`e#;ECVX)_x$qqPMwzg1>@$dOqMKRR0BX#x@kX$PtkHVJy#1|t9S0Qciaz1?c h@ZrOU4<9}Z@gETEdf*i5`~?62002ovPDHLkV1ivnpxpof diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml index 750b7e3..73c1612 100644 --- a/oeffi/res/values-de/networks.xml +++ b/oeffi/res/values-de/networks.xml @@ -93,8 +93,6 @@ Lokal- und Regionalverkehr Spanien Lokal- und Regionalverkehr (z.B. Barcelona) - Belgien - Fern-, Regional und Lokalverkehr (z.B. Antwerpen, Gent, Charleroi, Brüssel) Luxemburg Lokal- und Regionalverkehr Niederlande diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml index c4202a5..c9035c3 100644 --- a/oeffi/res/values/networks.xml +++ b/oeffi/res/values/networks.xml @@ -93,8 +93,6 @@ local and regional Spain local and regional (e.g. Barcelona) - Belgium - long-distance, regional and local (e.g. Antwerp, Ghent, Charleroi, Brussels) Luxembourg local and regional Netherlands diff --git a/oeffi/res/xml/network_security_config.xml b/oeffi/res/xml/network_security_config.xml index c3d91c4..d2d41f7 100644 --- a/oeffi/res/xml/network_security_config.xml +++ b/oeffi/res/xml/network_security_config.xml @@ -10,7 +10,6 @@ - www.belgianrail.be android.vrsinfo.de wojhati.rta.ae appefa10.verbundlinie.at diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java index c64db6e..50599d5 100644 --- a/oeffi/src/de/schildbach/oeffi/Application.java +++ b/oeffi/src/de/schildbach/oeffi/Application.java @@ -121,6 +121,12 @@ public class Application extends android.app.Application { FavoriteStationsProvider.deleteFavoriteStations(this, AVV); QueryHistoryProvider.deleteQueryHistory(this, AVV); + // 2023-12-17: migrate SNCB to use RT + final String SNCB = "SNCB"; + migrateSelectedNetwork(SNCB, NetworkId.RT); + FavoriteStationsProvider.deleteFavoriteStations(this, SNCB); + QueryHistoryProvider.deleteQueryHistory(this, SNCB); + log.info("Migrations took {}", watch); } diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index 6a6a6d7..2d16419 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -55,7 +55,6 @@ import de.schildbach.pte.RtProvider; import de.schildbach.pte.RtaChicagoProvider; import de.schildbach.pte.SeProvider; import de.schildbach.pte.ShProvider; -import de.schildbach.pte.SncbProvider; import de.schildbach.pte.SpainProvider; import de.schildbach.pte.StvProvider; import de.schildbach.pte.SydneyProvider; @@ -183,8 +182,6 @@ public final class NetworkProviderFactory { return new ParisProvider(NAVITIA_AUTHORIZATION); else if (networkId.equals(NetworkId.SPAIN)) return new SpainProvider(NAVITIA_AUTHORIZATION); - else if (networkId.equals(NetworkId.SNCB)) - return new SncbProvider("{\"type\":\"AID\",\"aid\":\"sncb-mobi\"}"); else if (networkId.equals(NetworkId.LU)) return new LuProvider("{\"type\":\"AID\",\"aid\":\"SkC81GuwuzL4e0\"}"); else if (networkId.equals(NetworkId.NS)) From 5815a985f52f3fd2131610575ec0d8b2b3d86ea4 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 18 Dec 2023 00:04:17 +0100 Subject: [PATCH 048/111] network_nri_icon.png, network_pl_icon.png, network_tfi_icon.png: remove some icons which were orphaned a while ago --- oeffi/res/drawable-xhdpi/network_nri_icon.png | Bin 1803 -> 0 bytes oeffi/res/drawable-xhdpi/network_pl_icon.png | Bin 1416 -> 0 bytes oeffi/res/drawable-xhdpi/network_tfi_icon.png | Bin 1509 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 oeffi/res/drawable-xhdpi/network_nri_icon.png delete mode 100644 oeffi/res/drawable-xhdpi/network_pl_icon.png delete mode 100644 oeffi/res/drawable-xhdpi/network_tfi_icon.png diff --git a/oeffi/res/drawable-xhdpi/network_nri_icon.png b/oeffi/res/drawable-xhdpi/network_nri_icon.png deleted file mode 100644 index 0b5115be676d5b9b5aba290943d686f637a89af3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1803 zcmV+m2lV)fP)3$g6vuxvEiIJV7D1FEyMm%f0%0k*9Sk6#hzc$QjS4P+qAVid5;cMgQAq$33@9Li zMl@_LX!Izp3JDrOAfOUuFBT}!f$kkY^wG|=uhZ#t`re&{^I_6^?>leK|DN-|_uOR) z7bH5O5$bu3F}|A)uPFD>MD>KH>oLImt100ar|~mVz5wmaUZ5{qrPN>#XyxZL{^St~ z87W`rRA3VTo4H6E845rFK_}=aK{MzGyh|eMbPN;J!(m__w{nIe?FQ;KE`+oNbBN=5 z>7stRpriw{SjJ(pxQ$c58P;(lZTXu^NG45uW&v2meH3yPLzzb=1Aqh4PWRH8Ozz+$ z0Dag}p)iz8d}0uQ9<--~wX9|fGiVNc!UD2@WBBL<9H)r%0F^`1MiI9-pr}XD%F%us z18E18GMDB6B#{NcrE~(IMUeS$xvmzsNUW`hXFmw~nxOM_F{KP^?#nSYMPq>&(h$Z^I4 z@!ZTd=7*XIJPjN`sjOlMFr6M8VM;9uH;`2sDB6ZUX$*jmKNu)yT?ipv$^8J_&F6Gw zcgTl#O1EnI`7{Pjk;cQa)X@;qB>h!0*ku(z1iq<7<*-fNe*n^qVXU=Rif^#apG;rI z(i%S=AO&b!i^fMbbvJCize&o_DpgEVtOt$Yf@l<2b3{qs4 zgW0G8ERY?*Q@|1WL6G?{UZ&SXWo=gl5WLQEN7HFRf25~H+NKl+HTqdd8+L=tC)ZXz zxmwLz?00NMrf@eeGniqlq(Dk_E{~BC2td5$>6pS8n|S|@;Zoq{nmCnNT+0+jvw%s! zg7Oihva58QSbmZfoUm#~G7o^yWDo_Bd~Nhbq49L$7am|eW69BEUaivZXLW$LhS8Ke zIL243r;I6l4ieGVMsXCHgc)t*R=N&x%pA>fR-o2SJ9r`^ppb7W3;py^ChYL8KI#h z3L&JqG@&2aas;#ynS8(^pqNJFNlHT}yYcnz|KFG>E3MLVyaDt9kOciSvT?;x52%M0 zl4Jdy$_e7EhH)$roRDaaLI>H#AQFHh(%PvVj%cP5T}dGUfI;e%{ZUP)x6&Dasj|zt zJ*KF6KxbO!!*=KTKS}@;;B9`giZ69;RWdT*!6I&k8 z(x6aO89?lCKmp2v-trE_5CB1E28H2YvcXvZo_c#Am$ZP2?(C3Q@qm_hKybcUGFrc=hu01p=9 zibNhly@_K|KzVK^0lC7D8TYQ}DcetgZlvXcW?TN;njBOnOw( z-SI$VqtHq6s+^?v!X@!U6#ZTb2)xUaBQ4zm;H|s)0$BuKMLGbnJ~@- z+oOgAu(XEz%+)1TZ#K{alE;@}&*I9H#sScW8CD1V5r*YL3Q3%;O9zPGuu&*%27n*0 z_|-TP`vOi~YV+PI#kduj)+L0BCBZNfEBNaJ-vka6vb7E@FmN6y<2b*Dshw{i0AMZ| zVf1Yo@6bVw1Tcx~!T?Y#Q#tAWu7t;CDcLAwo|#V$ZGqqE>Av}P9Dv>-H8QPrKnD}d zw-2Fx;$d=)8f~rpX(QHSwg4nsFSGeMNI7x;W3nuzBkR~@1_0ZsNIzz@P4z$0@%&A6 zO%|W~X++K2D)zrEec$2;AU+UNJ)j6$MAiQ&;NX4e`f>n}1ZHzEpz@ToR$>HzB`?qo tAAaBrPfIg3BxLF=+S`P^hYMn^{14(u;}piIt!e-O002ovPDHLkV1ftsKF9z7 diff --git a/oeffi/res/drawable-xhdpi/network_pl_icon.png b/oeffi/res/drawable-xhdpi/network_pl_icon.png deleted file mode 100644 index 58f18d457c0a1c4d8024e07fcedccecfc427d925..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1416 zcmV;31$X+1P)1i$6vuyWX(>xfp-|buLMc?BRjC4sM+Z!JMI*DypcWTACt0KZOj2lgl>}bO1mHu$9Si46NZC z(2F8Dr9=6Esn>qLL=ESuwGcB|b0=)R~X5Tu!#WAs z+{BtfC&n?GsSHe7teHg_hb;rBm%A9wG>XYdadLjyK^sND521hd@W=(4vggU zcF{F?>PPozm&5s!e>rDRzMMjidaMC7aK)&Uzgsl79UkDaQ2<4Bu>>I1>@^DDiD(AtQPc z53yN$*#jstrlj=S11K;Apppg~04h9Y2*5y6>{y_;F)7^<8x~NHl(EtffE{wdGJu4@ zkX#4`tIbVZg&F~{lq`Dy2bjhV0|0Wd7Y8InJ*7t2pv9gAkdPr|&D)x33jnC)q5()gn4X^xdB+1B+40icib zE+PJAO0@FBqT~FUXQU-|rk5b;SVD3@=dg|;39-gi9*~&bK?gd}I*LKDn&NT%`ySqr z<*^4kklRQ(Ke4UDVe1oC$1~99gyVP~E-;$D9e6}FPfA0))s7?52iZ+F05vqw&(h67 zrpTZ14RtO(u4E@oz%h#XF6wG;uY(+m_ceZ}<}X2AK`I55$Ul0L(TpGi4{((|jKxO= zaG29nQb>Rax7cVXovDj=vp6R8kwu!Ex)%7>@)GbfKk_k?>B@`rU?qE`R{IlRCV9Md zV?6{Yl0eb{+Tg5ZHC~2sqBS&W4yjb#oZ;wtmfzR|qoSW#zYR;M&Ggeb!URTMpFT+Y z=KVU#*+3T1lOdcn%>rI&xjFTSQ1NwQ1dCXJk32cUohlusTQvn&u3Wit<;s;Sr}ZCD W(_L9FCiB_=0000jO^8d{m?rkk77ZSUJ3ds$Owoy+r_&3Jz>*m=(TJm>qn|DNA@ z4kRf_NlH?Zt}Rldt2vxvH@J<8PPb066M$SMv!57koaGc%(o;0h zZWLO~L1H*KKnpoE0uU!(PUufWsbM_POD1lW`@KFZ)r#lvC!@1)^0>J$H^%SB)~ zP;|w-q4We3QkV>+UpAbQkbjMSp?_UvYLULv158M#uqgr8J2gsn_dD^MzTrcbuIYXT zwg;MhkGEWHgMl@HW)Ify>D`S!pcB{;c#$*ok$C7DNGQI-z*0Hx1sgF4f0!Q9IE};u zF4f93iFJbsX*D++Stx^YBD^ohLuEjrgeMurKtPFdM_@n5m5?>iUI9JJ53&ukl+6Jb z%$GmAt(?|UHWLrH`bt^UU9}LD84%9MZb)PbkgYE=$;5`jO-43dPWRJt78_d2RYjHR zL&h0${&Lstpc=A`31f_yW z5msF?+*fM#99b-48dc1qC9q$$QpS2F%1+Y^yvkfMx(JSw*kUjkG)WeyL)=}D!ix!I z@*oSi`-<^xM#DfIfVi%wyhyH)>Mr1$rt9qO$fnD$)LMl8C`Xw?jaYah^i8O&@M zt(AS%U;mXd8cQ?2TCk6 zkZRS56$<%=ZOpO8K!#@8&%{xhX{EtZO_V36ZL95qI9;T(Gvt`S?;XBp20Dt}`3z?$ zQI4~ZPo+xR%%nuMS5E)yW9!Ulpc`Iv>vUe{Z7=V%+$lH|4JbIoj5=|>cosz@khnG( zjzVoAYCs`_Cc_LMPG}ksDDDYWc#z=N+c=uKFij{kasJ2Pu9#xlyau9F-yV=-T>g#X z!-@UofeDPhpERmNe+b?3*2&S z2&Ju}xAGk|%#-aphCvLVjU$xslmQQjiLYZ)UVUJXIG{rS#Ue|Da~73;2%CU?Uf3B3DOnpP`r&0a}TZ2HZ$K$1G_;ppuP1lw4o|1qQ&!nL#a+ zB~5xUlXP+X!gps7H+6*2hr|g~^E^y8V5*rkH0F#0@uDF^`H_Zt`!CInOYD8MsTuuNj6 zOvaZ91t{Hq<1uzi1J=l$2@L~IbX*;D{i z41C2(ewM@LiUZpWWYfSivO=?2&PmqG?_67?=_DyhNlH?Z{y+3LZ)AasprVb000000 LNkvXXu0mjfqMx%b From 4c8d26dee7024f2e6bbcd69c4ab3c8faf3ace393 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 18 Dec 2023 00:23:42 +0100 Subject: [PATCH 049/111] 12.1.18 --- 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 da34bed..64f5674 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="120117" - android:versionName="12.1.17"> + android:versionCode="120118" + android:versionName="12.1.18"> Date: Mon, 1 Jan 2024 20:38:50 +0100 Subject: [PATCH 050/111] strings.xml: update year of copyright --- oeffi/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/res/values/strings.xml b/oeffi/res/values/strings.xml index 4e41937..e4d1657 100644 --- a/oeffi/res/values/strings.xml +++ b/oeffi/res/values/strings.xml @@ -46,7 +46,7 @@ About Offi Copyright - © 2010-2023, the Öffi developers + © 2010-2024, the Öffi developers License Privacy Policy https://oeffi.schildbach.de/privacy_policy.txt From 8836b3df20c7903a39fa5843c994a447eb06c7fe Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 27 Apr 2024 10:33:41 +0200 Subject: [PATCH 051/111] plans-index.txt: sync plans metadata --- oeffi/assets/plans-index.txt | 85 +++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 39 deletions(-) diff --git a/oeffi/assets/plans-index.txt b/oeffi/assets/plans-index.txt index 43f896d..8a86281 100644 --- a/oeffi/assets/plans-index.txt +++ b/oeffi/assets/plans-index.txt @@ -3,11 +3,11 @@ # de -berlin_bsu_ab|52.520134,13.388018|2020-10-31|Berlin S+U-Bahn-Netz (AB)|Berliner Verkehrsbetriebe||BVG -berlin_bsu_abc|52.520134,13.388018|2019-10-31|Berlin S+U-Bahn-Netz (ABC)|Berliner Verkehrsbetriebe||BVG -berlin_tram|52.521152,13.412832|2020-04-14|Berlin Tram-Netz|Berliner Verkehrsbetriebe||BVG -berlin_bus|52.5071378,13.3318680|2019-12-15|Berlin Bus-Netz|Berliner Verkehrsbetriebe||BVG -berlin_nacht|52.520134,13.388018|2020-10-31|Berlin Nachtverkehr (geografisch)|Berliner Verkehrsbetriebe||BVG +berlin_bsu_ab|52.520134,13.388018|2022-12-11|Berlin S+U-Bahn-Netz (AB)|Berliner Verkehrsbetriebe||BVG +berlin_bsu_abc|52.520134,13.388018|2022-12-11|Berlin S+U-Bahn-Netz (ABC)|Berliner Verkehrsbetriebe||BVG +berlin_tram|52.521152,13.412832|2022-12-16|Berlin Tram-Netz|Berliner Verkehrsbetriebe||BVG +berlin_bus|52.5071378,13.3318680|2022-12-09|Berlin Bus-Netz|Berliner Verkehrsbetriebe||BVG +berlin_nacht|52.520134,13.388018|2022-12-09|Berlin Nachtverkehr (geografisch)|Berliner Verkehrsbetriebe||BVG berlin_transitmap|52.520134,13.388018|2018-12-09|New Berlin rapid transit route map|berlintransitmap.de berlin_anbindung_ber|52.363127,13.50498|2020-11|BER (Flughafen Berlin Brandenburg) Anbindung|Robert Aehnelt, Creative Commons|https://upload.wikimedia.org/wikipedia/commons/e/e0/BER_Anbindung_2020.jpg brandenburg_regionalverkehr|52.525578,13.369523|2019-12-15|Brandenburg Regionalverkehr|Verkehrsverbund Berlin-Brandenburg||VBB @@ -42,10 +42,10 @@ augsburg|48.364936,10.893713|2018-12|Augsburg Innenraum|AVV GmbH augsburg_nachtbus|48.364936,10.893713|2018-12|Augsburg Nachtbus|AVV GmbH ulm_stadt|48.398610,9.983322|2018-12|Ulm / Neu-Ulm Stadtnetz|Donau-Iller-Nahverkehrsverbund GmbH ulm_regional|48.398610,9.983322|2018-11-02|Ulm Regionalnetz|Donau-Iller-Nahverkehrsverbund GmbH -nuernberg_gesamtraum|49.445719,11.082618|2018-01-01|Nürnberg Schienennetz Gesamtraum|Verkehrsverbund Großraum Nürnberg||VGN -nuernberg_verkehrsnetz|49.445719,11.082618|2019-12-01|Nürnberg, Fürth, Stein Verkehrsnetz|Verkehrsverbund Großraum Nürnberg||VGN -nuernberg_schiene|49.445719,11.082618|2019-12-01|Nürnberg, Fürth Schienennetz|Verkehrsverbund Großraum Nürnberg||VGN -nuernberg_nightliner|49.445719,11.082618|2019-12-01|Nürnberg, Fürth Nightliner|Verkehrsverbund Großraum Nürnberg||VGN +nuernberg_gesamtraum|49.445719,11.082618|2024-01-01|Nürnberg Schienennetz Gesamtraum|Verkehrsverbund Großraum Nürnberg||VGN +nuernberg_verkehrsnetz|49.445719,11.082618|2023-12-10|Nürnberg-Fürth Liniennetz|Verkehrsverbund Großraum Nürnberg||VGN +nuernberg_schiene|49.445719,11.082618|2023-12-10|Nürnberg-Fürth Schienennetz|Verkehrsverbund Großraum Nürnberg||VGN +nuernberg_nightliner|49.445719,11.082618|2023-12|Nürnberg-Fürth Nightliner|Verkehrsverbund Großraum Nürnberg||VGN fuerth_verkehrsnetz|49.469832,10.990178|2019-12-01|Fürth Verkehrsnetz|Verkehrsverbund Großraum Nürnberg||VGN fuerth_nightliner|49.469832,10.990178|2016-12-11|Fürth Nightliner|Verkehrsverbund Großraum Nürnberg||VGN erlangen_verkehrsnetz|49.595851,11.001701|2019-12-01|Erlangen Verkehrsnetz|Verkehrsverbund Großraum Nürnberg||VGN @@ -59,26 +59,26 @@ regensburg_nacht|49.011489,12.09971|2018-04-14|Regensburg Nachtbus|Regensburger bremen|53.08319,8.81360|2020-03|Bremen Liniennetz|BSAG bremen_nacht|53.08319,8.81360||Bremen Nachtnetz|BSAG bremen_stadt|53.08319,8.81360|2020-02|Bremen Stadtnetz (geografisch)|BSAG -hamburg_usar|53.552946,10.006782|2022-01-01|Hamburg Schnellbahn/Regional|HVV -hamburg_metrobus_gross|53.552946,10.006782|2021-12-12|Hamburg MetroBus Liniennetz|HVV -hamburg_region|53.552946,10.006782|2022-01-01|Hamburg Regionalverkehr|HVV -hamburg_weiss_bus|53.552946,10.006782|2021-12-12|Hamburg Busliniennetz|Lucas Weiss +hamburg_usar|53.552946,10.006782|2023-12-10|Hamburg Schnellbahn/Regional|HVV +hamburg_metrobus_gross|53.552946,10.006782|2023-12-10|Hamburg MetroBus Liniennetz|HVV +hamburg_region|53.552946,10.006782|2023-12-10|Hamburg Regionalverkehr|HVV +hamburg_weiss_bus|53.552946,10.006782|2024-01-08|Hamburg Busliniennetz|Lucas Weiss kiel_liniennetz|54.313282,10.132341|2019-12|Kiel Liniennetz|KVG kiel_nacht|54.313282,10.132341|2019-12|Kiel Nachtliniennetz|KVG luebeck_region|53.858795,10.664646|2018-12-09|Lübeck Liniennetz Region|LVG, nah.sh, Stadtverkehr Lübeck||SH -rostock_vvw_liniennetz|54.078139,12.131724|2022-08-05|Rostock Liniennetz|Verkehrsverbund Warnow -rostock_vvw_region|54.078139,12.131724|2022-01-01|Rostock Region|Verkehrsverbund Warnow -rostock_region|54.078139,12.131724|2022-08-15|Rostock und Umgebung|Lucas Weiss, CC-BY-NC-SA 4.0 +rostock_vvw_liniennetz|54.078139,12.131724|2023-08-28|Rostock Liniennetz|Verkehrsverbund Warnow +rostock_vvw_region|54.078139,12.131724|2023-08-28|Rostock Region|Verkehrsverbund Warnow +rostock_region|54.078139,12.131724|2023-12-10|Rostock und Umgebung|Lucas Weiss, CC-BY-NC-SA 4.0 wismar|53.903943,11.391928||Wismar Stadtverkehr|NAHBUS Nordwestmecklenburg GmbH nordwestmecklenburg|53.903943,11.391928|2016-03-14|Nordwestmecklenburg Busnetz|NAHBUS Nordwestmecklenburg GmbH osnabrueck|52.272832,8.061726|2018-08-09|Osnabrück Liniennetz|Stadtwerke Osnabrück osnabrueck_nacht|52.272832,8.061726|2018-08-09|Osnabrück NachtBus-Netz|Stadtwerke Osnabrück -stuttgart_verbund|48.784068,9.181713|2018-12|Stuttgart Verbund-Liniennetz|Verkehrs- und Tarifverbund Stuttgart GmbH -stuttgart_nacht|48.77861,9.179803|2018-12|Stuttgart Nachtverkehr|Verkehrs- und Tarifverbund Stuttgart GmbH +stuttgart_verbund|48.784068,9.181713|2023-12|Stuttgart Verbund-Liniennetz|Verkehrs- und Tarifverbund Stuttgart GmbH +stuttgart_nacht|48.77861,9.179803|2023-12|Stuttgart Nachtverkehr|Verkehrs- und Tarifverbund Stuttgart GmbH ringzug|48.113621,8.660603|2013-08|Ringzug|Zweckverband Ringzug -hannover_stadtbahn|52.376715,9.741168|2021-12|Hannover Stadtbahnnetz|GVH -hannover_bus|52.376715,9.741168|2021-12|Hannover Busnetz|GVH -hannover_regional|52.376715,9.741168|2021-12|Hannover Regional- und S-Bahn-Linien|GVH +hannover_stadtbahn|52.376715,9.741168|2023-12-10|Hannover Stadtbahnnetz|GVH +hannover_bus|52.376715,9.741168|2023-12-10|Hannover Busnetz|GVH +hannover_regional|52.376715,9.741168|2023-12-10|Hannover Regional- und S-Bahn-Linien|GVH celle_stadt|52.620411,10.059814|2019-01|Celle Liniennetz Stadt|CeBus celle_region|52.620411,10.059814|2018-01|Celle Liniennetz Region|CeBus goettingen|51.536290,9.926981|2019-12-15|Göttingen Liniennetz|Göttinger Verkehrsbetriebe GmbH @@ -89,10 +89,17 @@ bielefeld_netz|52.029241,8.532835|2018-06|Bielefeld Netzplan (geografisch)|moBie essen_schiene|51.451355,7.014793|2015-06-14|Essen SchienenNetz|EVAG essen_tag|51.451355,7.014793|2015-06-14|Essen TagNetz|EVAG essen_nacht|51.451355,7.014793|2013-06-09|Essen NachtNetz|EVAG -krefeld_stadt|51.323714,6.565800|2013-06|Krefeld Liniennetz Stadt|SWK/VRR -krefeld_stadt_nacht|51.323714,6.565800|2013-06|Krefeld Nachtnetz|SWK/VRR +dortmund_schiene|51.517843,7.459272|2023-01|Dortmund Schienennetz|DSW21 +dortmund_tag|51.517843,7.459272|2023-12|Dortmund Netzplan Tag|DSW21 +dortmund_nacht|51.517843,7.459272|2021-01|Dortmund Netzplan Nacht|DSW21 +krefeld_stadt|51.323714,6.565800|2021-05|Krefeld Liniennetz Stadt|SWK/VRR +krefeld_stadt_nacht|51.323714,6.565800|2021-05|Krefeld Nachtnetz|SWK/VRR frankfurt_liniennetz|50.106318,8.662139|2020-12-13|Frankfurt am Main Liniennetz|traffiQ frankfurt_flughafen_bus|50.037936,8.559958|2020-12-13|Frankfurt Flughafen Buslinien|traffiQ +gelsenkirchen_linienplan_tag|51.504768,7.102298|2023-01|Gelsenkirchen Linienplan Tag|Vestische +gelsenkirchen_linienplan_nacht|51.504768,7.102298|2023-01|Gelsenkirchen Linienplan Nacht|Vestische +recklinghausen_linienplan|51.616096,7.203273|2023-06|Recklinghausen Linienplan|Vestische +waltrop_linienplan|51.622799,7.390409|2022-08|Waltrop Linienplan|Vestische rmv_schnellbahn|50.106318,8.662139|2020-12-13|Rhein-Main Schnellbahn|RMV rmv_regional|50.106318,8.662139|2020-12-13|Rhein-Main Regional|RMV rmv_nacht|50.106318,8.662139|2020-12-13|Rhein-Main Nachtnetz|RMV @@ -106,29 +113,29 @@ leverkusen_bus|51.036197,6.994385|2019-12-15|Leverkusen Busnetz|Verkehrsverbund nrw_regio|51.429807,6.775253|2016-12|NRW Busse & Bahnen|VRS aachen_schnellverkehr|50.768399,6.090705|2018-12|Aachen Schnellverkehr|Aachener Verkehrsverbund GmbH||AVV_AACHEN aachen_region|50.768399,6.090705|2018-12|Aachen Region, Bus und Bahn|Aachener Verkehrsverbund GmbH||AVV_AACHEN -darmstadt|49.872582,8.630916|2021-12-12|Darmstadt Stadt|Darmstadt-Dieburger Nahverkehrsorganisation -darmstadt_nacht|49.872582,8.630916|2021-12-12|Darmstadt NightLiner|Darmstadt-Dieburger Nahverkehrsorganisation -darmstadt_region|49.872582,8.630916|2021-12-12|Darmstadt-Dieburg Region|Darmstadt-Dieburger Nahverkehrsorganisation -duesseldorf|51.230794,6.769025|2018-08-29|Düsseldorf Liniennetz|Rheinbahn -duesseldorf_nacht|51.230794,6.769025|2018-08-29|Düsseldorf Nachtlinien|Rheinbahn +darmstadt|49.872582,8.630916|2023-12-10|Darmstadt Stadt|Darmstadt-Dieburger Nahverkehrsorganisation +darmstadt_nacht|49.872582,8.630916|2023-12-10|Darmstadt NightLiner|Darmstadt-Dieburger Nahverkehrsorganisation +darmstadt_region|49.872582,8.630916|2023-12-10|Darmstadt-Dieburg Region|Darmstadt-Dieburger Nahverkehrsorganisation +duesseldorf|51.230794,6.769025|2024-01-07|Düsseldorf Liniennetz|Rheinbahn +duesseldorf_nacht|51.230794,6.769025|2024-01-07|Düsseldorf Nachtlinien|Rheinbahn duisburg|51.428813,6.772554|2018-03-01|Duisburg Liniennetz|DVG/VRR schwerin|53.634476,11.407313|2018-07|Schwerin Liniennetz|Nahverkehr Schwerin GmbH magdeburg_tag|52.130783,11.627347|2021-12-24|Magdeburg Liniennetz|Magdeburger Verkehrsbetriebe GmbH & Co. KG magdeburg_nacht|52.130783,11.627347|2021-12-24|Magdeburg Nacht-Liniennetz|Magdeburger Verkehrsbetriebe GmbH & Co. KG magdeburg_verbund|52.130783,11.627347|2020-12|Magdeburg Verbund-Liniennetz|Nahverkehrsservice Sachsen-Anhalt GmbH -hagen|51.362675,7.461087|2022-06-12|Hagen Liniennetz|Hagener Straßenbahn AG -hagen_nacht|51.362675,7.461087|2022-06-12|Hagen Nachtnetz|Hagener Straßenbahn AG -braunschweig_gesamt|52.252187,10.539705|2021-04-11|Braunschweig Liniennetz|Braunschweiger Verkehrs-GmbH -braunschweig_nacht|52.252187,10.539705|2021-04-11|Braunschweig Nachtnetz|Braunschweiger Verkehrs-GmbH +hagen|51.362675,7.461087|2024-01-08|Hagen Liniennetz|Hagener Straßenbahn AG +hagen_nacht|51.362675,7.461087|2024-01-08|Hagen Nachtnetz|Hagener Straßenbahn AG +braunschweig_gesamt|52.252187,10.539705|2024-03-18|Braunschweig Liniennetz|Braunschweiger Verkehrs-GmbH +braunschweig_nacht|52.252187,10.539705|2024-03-18|Braunschweig Nachtnetz|Braunschweiger Verkehrs-GmbH salzgitter|52.15116,10.332488|2017-12|Salzgitter Liniennetz|KVG Braunschweig wolfenbuettel|52.15898,10.532012|2021-10|Wolfenbüttel Liniennetz|KVG Braunschweig helmstedt|52.222331,11.010690|2015-12|Helmstedt Liniennetz|KVG Braunschweig harz|51.888518,10.554843|2018-06|Harz Liniennetz|KVG Braunschweig wolfsburg|52.429484,10.788249|2018-08-09|Wolfsburg Liniennetz|WVG -karlsruhe_liniennetz|48.993988,8.400328|2021-12-12|Karlsruhe Liniennetz|Karlsruher Verkehrsverbund||KVV +karlsruhe_liniennetz|48.993988,8.400328|2022-12-11|Karlsruhe Liniennetz|Karlsruher Verkehrsverbund||KVV karlsruhe_rolli|48.993988,8.400328|2021-12-12|Karlsruhe für mobilitätseingeschränkte Personen|Karlsruher Verkehrsverbund||KVV karlsruhe_regio|48.993988,8.400328|2020-12-13|Karlsruhe Regionalverkehr|Karlsruher Verkehrsverbund||KVV -karlsruhe_bus|49.009498,8.404073|2021-12-12|Karlsruhe Busnetz|Karlsruher Verkehrsverbund||KVV +karlsruhe_bus|49.009498,8.404073|2022-12-11|Karlsruhe Busnetz|Karlsruher Verkehrsverbund||KVV karlsruhe_nightliner|49.009498,8.404073|2020-11-28|Karlsruhe Nightliner|Karlsruher Verkehrsverbund||KVV badenbaden_busnetz|48.79014,8.19126|2021-02-18|Rastatt (Südlicher Landkreis) und Baden-Baden Busnetz|Karlsruher Verkehrsverbund||KVV rastatt_busnetz|48.86065,8.21525|2021-02-18|Karlsruhe (Südlicher Landkreis) und Rastatt (Nördlicher Landkreis) Busnetz|Karlsruher Verkehrsverbund||KVV @@ -148,8 +155,8 @@ rhein_neckar_regio|49.481844,8.459115|2019-11|Rhein-Neckar Regionalverkehr|RNV G # at -linz|48.290893,14.291965|2018-10|Linz Verkehrslinienplan|Linz AG -linz_nacht|48.290893,14.291965|2016-12|Linz Nachtverkehr|Linz AG +linz|48.290893,14.291965|2024-01|Linz Verkehrslinienplan|Linz AG +linz_nacht|48.290893,14.291965|2024-01|Linz Nachtverkehr|Linz AG innsbruck_liniennetz|47.26332,11.400951|2021|Innsbruck Liniennetz|Innsbrucker Verkehrsbetriebe GmbH innsbruck_tram|47.26332,11.400951|2012-12-15|Innsbruck Straßenbahn|Steve Stipsits|http://www.public-transport.at/netzplan_innsbruck_gross_aktuell.gif graz|47.073371,15.416154|2018-09-08|Graz Liniennetz|Verbund Linie @@ -224,7 +231,7 @@ istanbul_rail|41.011939,28.984308|2015-09|Istanbul Rail Transit|Maximilian Dörr # uk -london_tube|51.513507,-0.110264|2016-06|London Tube|TfL +london_tube|51.513507,-0.110264|2023-05|London Tube|TfL london_overground|51.513507,-0.110264|2016-05|London Overground|TfL london_rail|51.513507,-0.110264|2016-05|London Rail & Tube Services|TfL london_bus|51.513507,-0.110264|2016|London Bus (geographical)|TfL @@ -244,7 +251,7 @@ napoli_region|40.852780,14.271692||Napoli Region|Unico Campania # fr -paris_metro_ratp|48.855414,2.34488|2014-01|Paris Metro|RATP +paris_metro_ratp|48.855414,2.34488|2022-12|Paris Metro|RATP paris_metro|48.855414,2.34488|2012-12|Paris Metro|Nathan Kaufmann, Creative Commons # po @@ -280,7 +287,7 @@ losangeles_system|34.05427,-118.246715|2016-06|Los Angeles System|metro.net losangeles_downtown|34.05427,-118.246715|2016-06|Los Angeles Downtown|metro.net losangeles_metro|34.05427,-118.246715|2016-05|Los Angeles Metro|metro.net|https://media.metro.net/riding_metro/maps/images/rail_map.gif losangeles_metro_metrolink|34.05427,-118.246715|2016-11|Los Angeles Metro & Rail|metro.net|https://media.metro.net/riding_metro/maps/images/metro_regionalrail_map.gif -newyork_subway|40.738452,-73.991919|2010-12|New York Subway (geographical)|MTA +newyork_subway|40.738452,-73.991919|2023-02|New York Subway (geographical)|MTA philadelphia_regional|39.957386,-75.180488|2012-06|Philadelphia Regional Train & Rail Transit|SEPTA chicago_downtown|41.878674,-87.640333|2016-02|Chicago Downtown|RTA Chicago chicago_trains|41.878674,-87.640333|2015-03|Chicago Train Connections|RTA Chicago From f4ce1d0e4384d97126a0940b99654d03859d21dd Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 27 Apr 2024 12:22:12 +0200 Subject: [PATCH 052/111] build.gradle: update Guava to 33.1.0-android --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index ebb28f1..b40c31c 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -23,7 +23,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:32.1.3-android' + implementation 'com.google.guava:guava:33.1.0-android' implementation 'org.osmdroid:osmdroid-android:6.1.17' implementation 'org.slf4j:slf4j-api:2.0.9' implementation 'com.github.tony19:logback-android:3.0.0' From 33284c92c2a26d066b66153e82d2a28c2ac29c26 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 27 Apr 2024 12:32:41 +0200 Subject: [PATCH 053/111] build.gradle: update AndroidX Core to 1.13.0 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index b40c31c..5e68c4d 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -17,7 +17,7 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' - implementation 'androidx.core:core:1.12.0' + implementation 'androidx.core:core:1.13.0' implementation 'androidx.activity:activity:1.8.2' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.13' From 71e68765cda72e4b0c4b61831b54012ad09a2610 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 27 Apr 2024 12:34:21 +0200 Subject: [PATCH 054/111] build.gradle: update AndroidX Activity to 1.9.0 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 5e68c4d..52a3ff0 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -18,7 +18,7 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' implementation 'androidx.core:core:1.13.0' - implementation 'androidx.activity:activity:1.8.2' + implementation 'androidx.activity:activity:1.9.0' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.13' //noinspection GradleDependency From 70c1ac5fa4c1bd777a9aa41adda5cfc56337c314 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 27 Apr 2024 12:45:13 +0200 Subject: [PATCH 055/111] build.gradle: lock SLF4J to 2.0.9 --- oeffi/build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 52a3ff0..0e9fbad 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -12,7 +12,9 @@ configurations { } dependencies { - implementation project(':public-transport-enabler') + implementation(project(':public-transport-enabler')) { + exclude group: 'org.slf4j', module: 'slf4j-api' + } implementation 'androidx.annotation:annotation:1.7.1' implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' @@ -25,6 +27,7 @@ dependencies { implementation 'com.squareup.okhttp3:logging-interceptor:3.12.13' implementation 'com.google.guava:guava:33.1.0-android' implementation 'org.osmdroid:osmdroid-android:6.1.17' + //noinspection GradleDependency implementation 'org.slf4j:slf4j-api:2.0.9' implementation 'com.github.tony19:logback-android:3.0.0' testImplementation 'junit:junit:4.13.2' From 17727a1e3a1939f442024ed144dbd7abe978ba2d Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 27 Apr 2024 10:29:54 +0200 Subject: [PATCH 056/111] Application: migrate MVV to new station IDs --- oeffi/src/de/schildbach/oeffi/Application.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java index 50599d5..124da79 100644 --- a/oeffi/src/de/schildbach/oeffi/Application.java +++ b/oeffi/src/de/schildbach/oeffi/Application.java @@ -127,6 +127,10 @@ public class Application extends android.app.Application { FavoriteStationsProvider.deleteFavoriteStations(this, SNCB); QueryHistoryProvider.deleteQueryHistory(this, SNCB); + // 2024-04-27: EFA-ID migration of MVV + FavoriteStationsProvider.migrateFavoriteStationIds(this, NetworkId.MVV, "0", "10000", 91000000); + QueryHistoryProvider.migrateQueryHistoryIds(this, NetworkId.MVV, "0", "10000", 91000000); + log.info("Migrations took {}", watch); } From afdd237cca3828da63aa4c512c019b160d9ebed9 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 27 Apr 2024 12:50:28 +0200 Subject: [PATCH 057/111] Application: remove a couple of old database migrations --- oeffi/src/de/schildbach/oeffi/Application.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java index 124da79..ab271df 100644 --- a/oeffi/src/de/schildbach/oeffi/Application.java +++ b/oeffi/src/de/schildbach/oeffi/Application.java @@ -91,18 +91,6 @@ public class Application extends android.app.Application { for (final File file : getFilesDir().listFiles(filter)) file.delete(); - // 2021-09-18: migrate SBB to use RT - final String SBB = "SBB"; - migrateSelectedNetwork(SBB, NetworkId.RT); - FavoriteStationsProvider.deleteFavoriteStations(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); - // 2023-01-09: migrate VMS to use VVO final String VMS = "VMS"; migrateSelectedNetwork(VMS, NetworkId.VVO); From 1a7e46a3af0d80940ab680f9b1eaa8498e6b801d Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 27 Apr 2024 12:53:00 +0200 Subject: [PATCH 058/111] 12.1.19 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 64f5674..77bd2c9 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="120118" - android:versionName="12.1.18"> + android:versionCode="120119" + android:versionName="12.1.19"> Date: Fri, 3 May 2024 10:08:28 +0200 Subject: [PATCH 059/111] build.gradle: update Guava to 33.2.0-android --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 0e9fbad..24e3715 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.1.0-android' + implementation 'com.google.guava:guava:33.2.0-android' implementation 'org.osmdroid:osmdroid-android:6.1.17' //noinspection GradleDependency implementation 'org.slf4j:slf4j-api:2.0.9' From f7f93c1a889b8804200eaa5cc63ddc8883912a2f Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 3 May 2024 15:49:36 +0200 Subject: [PATCH 060/111] 12.1.20 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 77bd2c9..fc20b4d 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="120119" - android:versionName="12.1.19"> + android:versionCode="120120" + android:versionName="12.1.20"> Date: Thu, 30 May 2024 17:05:38 +0200 Subject: [PATCH 061/111] build.gradle: update AndroidX Core to 1.13.1 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 24e3715..95ccf9d 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' - implementation 'androidx.core:core:1.13.0' + implementation 'androidx.core:core:1.13.1' implementation 'androidx.activity:activity:1.9.0' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.13' From c6dcce604965ccd7068ccf75ee67b7c3aa81cb5c Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 1 Jun 2024 13:05:15 +0200 Subject: [PATCH 062/111] build.gradle: update Guava to 33.2.1-android --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 95ccf9d..c57a613 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.2.0-android' + implementation 'com.google.guava:guava:33.2.1-android' implementation 'org.osmdroid:osmdroid-android:6.1.17' //noinspection GradleDependency implementation 'org.slf4j:slf4j-api:2.0.9' From 30d2e47fc942f5d3c7f806c808f9a753d9549a78 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 6 Jun 2024 11:28:37 +0200 Subject: [PATCH 063/111] build.gradle: update AndroidX Annotation to 1.8.0 --- oeffi/build.gradle | 2 +- oeffi/proguard.cfg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index c57a613..dd91d5f 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -15,7 +15,7 @@ dependencies { implementation(project(':public-transport-enabler')) { exclude group: 'org.slf4j', module: 'slf4j-api' } - implementation 'androidx.annotation:annotation:1.7.1' + implementation 'androidx.annotation:annotation:1.8.0' implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' diff --git a/oeffi/proguard.cfg b/oeffi/proguard.cfg index 8253ee2..8df31dd 100644 --- a/oeffi/proguard.cfg +++ b/oeffi/proguard.cfg @@ -55,6 +55,7 @@ -dontwarn androidx.lifecycle.SavedStateHandle -dontwarn androidx.activity.Api34Impl -dontwarn androidx.activity.BackEventCompat +-dontnote androidx.activity.ImmLeaksCleaner$Companion$** -dontwarn androidx.core.view.accessibility.AccessibilityNodeInfoCompat$AccessibilityActionCompat -dontwarn androidx.**$Api34Impl,androidx.**$Api34Impl$** From 23a1daf92b779577b0518584e38259f19cb5fc96 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 6 Jun 2024 11:31:01 +0200 Subject: [PATCH 064/111] 12.1.21 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index fc20b4d..0986153 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="120120" - android:versionName="12.1.20"> + android:versionCode="120121" + android:versionName="12.1.21"> Date: Wed, 12 Jun 2024 18:07:00 +0200 Subject: [PATCH 065/111] Toast: remove stray imports --- oeffi/src/de/schildbach/oeffi/util/Toast.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/oeffi/src/de/schildbach/oeffi/util/Toast.java b/oeffi/src/de/schildbach/oeffi/util/Toast.java index e823108..35388d8 100644 --- a/oeffi/src/de/schildbach/oeffi/util/Toast.java +++ b/oeffi/src/de/schildbach/oeffi/util/Toast.java @@ -18,9 +18,6 @@ package de.schildbach.oeffi.util; import android.content.Context; -import android.graphics.PorterDuff; -import android.widget.TextView; -import de.schildbach.oeffi.R; public class Toast { private final Context context; From d92615efd9ac4bab89fa1ee354495adb43aadfd5 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 12 Jun 2024 17:50:22 +0200 Subject: [PATCH 066/111] OeffiMainActivity, PreferenceActivity: always show donate option --- oeffi/src-aosp/de/schildbach/oeffi/Variants.java | 1 - oeffi/src-google/de/schildbach/oeffi/Variants.java | 1 - oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java | 5 +---- .../de/schildbach/oeffi/preference/PreferenceActivity.java | 6 ++---- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/oeffi/src-aosp/de/schildbach/oeffi/Variants.java b/oeffi/src-aosp/de/schildbach/oeffi/Variants.java index 8f26f91..0fbc2a1 100644 --- a/oeffi/src-aosp/de/schildbach/oeffi/Variants.java +++ b/oeffi/src-aosp/de/schildbach/oeffi/Variants.java @@ -18,5 +18,4 @@ package de.schildbach.oeffi; public class Variants { - public static final boolean ENABLE_DONATE = true; } diff --git a/oeffi/src-google/de/schildbach/oeffi/Variants.java b/oeffi/src-google/de/schildbach/oeffi/Variants.java index 3fe9f90..0fbc2a1 100644 --- a/oeffi/src-google/de/schildbach/oeffi/Variants.java +++ b/oeffi/src-google/de/schildbach/oeffi/Variants.java @@ -18,5 +18,4 @@ package de.schildbach.oeffi; public class Variants { - public static final boolean ENABLE_DONATE = false; } diff --git a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java index fbab782..8a648ac 100644 --- a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java +++ b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java @@ -130,8 +130,6 @@ public abstract class OeffiMainActivity extends OeffiActivity { directionsItem.setChecked(OeffiMainActivity.this instanceof DirectionsActivity); final MenuItem plansItem = menu.findItem(R.id.global_options_plans); plansItem.setChecked(OeffiMainActivity.this instanceof PlansPickerActivity); - final MenuItem donateItem = menu.findItem(R.id.global_options_donate); - donateItem.setVisible(Variants.ENABLE_DONATE); } @Override @@ -174,8 +172,7 @@ public abstract class OeffiMainActivity extends OeffiActivity { } case R.id.global_options_donate: { - if (Variants.ENABLE_DONATE) - PreferenceActivity.start(OeffiMainActivity.this, DonateFragment.class.getName()); + PreferenceActivity.start(OeffiMainActivity.this, DonateFragment.class.getName()); return true; } diff --git a/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java b/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java index ff08703..182a1c0 100644 --- a/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java +++ b/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java @@ -21,7 +21,6 @@ import android.app.Activity; import android.content.Intent; import android.view.MenuItem; import de.schildbach.oeffi.R; -import de.schildbach.oeffi.Variants; import java.util.List; @@ -39,8 +38,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity { @Override public void onBuildHeaders(final List
target) { loadHeadersFromResource(R.xml.preference_headers, target); - if (Variants.ENABLE_DONATE) - loadHeadersFromResource(R.xml.preference_headers_donate, target); + loadHeadersFromResource(R.xml.preference_headers_donate, target); } @Override @@ -59,6 +57,6 @@ public class PreferenceActivity extends android.preference.PreferenceActivity { return CommonFragment.class.getName().equals(fragmentName) || DirectionsFragment.class.getName().equals(fragmentName) || AboutFragment.class.getName().equals(fragmentName) - || (Variants.ENABLE_DONATE && DonateFragment.class.getName().equals(fragmentName)); + || DonateFragment.class.getName().equals(fragmentName); } } From b0ea770ba3e0811753fcbffb6d3e5f1f6af0e726 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 12 Jun 2024 17:53:44 +0200 Subject: [PATCH 067/111] build.gradle: remove product flavors --- build.Containerfile | 2 +- oeffi/build.gradle | 18 ---------------- .../de/schildbach/oeffi/Variants.java | 21 ------------------- .../de/schildbach/oeffi/Variants.java | 21 ------------------- .../src/de/schildbach/oeffi/Application.java | 9 -------- .../de/schildbach/oeffi/OeffiActivity.java | 7 +------ .../schildbach/oeffi/OeffiMainActivity.java | 9 +------- .../schildbach/oeffi/util/ErrorReporter.java | 5 +---- settings.gradle | 3 +-- 9 files changed, 5 insertions(+), 90 deletions(-) delete mode 100644 oeffi/src-aosp/de/schildbach/oeffi/Variants.java delete mode 100644 oeffi/src-google/de/schildbach/oeffi/Variants.java diff --git a/build.Containerfile b/build.Containerfile index 0774630..a33b6a7 100644 --- a/build.Containerfile +++ b/build.Containerfile @@ -48,4 +48,4 @@ RUN if [ -e /dev/fuse ] ; \ # export build output FROM scratch AS export-stage -COPY --from=build-stage /home/builder/project/oeffi/build/outputs/apk/*/release/oeffi-*-release-unsigned.apk / +COPY --from=build-stage /home/builder/project/oeffi/build/outputs/apk/release/oeffi-release-unsigned.apk / diff --git a/oeffi/build.gradle b/oeffi/build.gradle index dd91d5f..9672ca7 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -53,18 +53,6 @@ android { } } - flavorDimensions 'flavor' - productFlavors { - aosp { - dimension 'flavor' - versionNameSuffix '-aosp' - } - google { - dimension 'flavor' - versionNameSuffix '-google' - } - } - sourceSets { main { manifest.srcFile 'AndroidManifest.xml' @@ -75,12 +63,6 @@ android { test { java.srcDirs = ['test'] } - aosp { - java.srcDirs = ['src-aosp'] - } - google { - java.srcDirs = ['src-google'] - } } compileOptions { diff --git a/oeffi/src-aosp/de/schildbach/oeffi/Variants.java b/oeffi/src-aosp/de/schildbach/oeffi/Variants.java deleted file mode 100644 index 0fbc2a1..0000000 --- a/oeffi/src-aosp/de/schildbach/oeffi/Variants.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package de.schildbach.oeffi; - -public class Variants { -} diff --git a/oeffi/src-google/de/schildbach/oeffi/Variants.java b/oeffi/src-google/de/schildbach/oeffi/Variants.java deleted file mode 100644 index 0fbc2a1..0000000 --- a/oeffi/src-google/de/schildbach/oeffi/Variants.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package de.schildbach.oeffi; - -public class Variants { -} diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java index ab271df..6196856 100644 --- a/oeffi/src/de/schildbach/oeffi/Application.java +++ b/oeffi/src/de/schildbach/oeffi/Application.java @@ -197,13 +197,4 @@ public class Application extends android.app.Application { public static final int versionCode(final Application application) { return application.packageInfo().versionCode; } - - public static final String versionFlavor(final Application application) { - final String applicationVersion = versionName(application); - final int applicationVersionSplit = applicationVersion.indexOf('-'); - if (applicationVersionSplit >= 0) - return applicationVersion.substring(applicationVersionSplit + 1); - else - return null; - } } diff --git a/oeffi/src/de/schildbach/oeffi/OeffiActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiActivity.java index 8ab20f5..04c5e2b 100644 --- a/oeffi/src/de/schildbach/oeffi/OeffiActivity.java +++ b/oeffi/src/de/schildbach/oeffi/OeffiActivity.java @@ -50,8 +50,7 @@ public abstract class OeffiActivity extends ComponentActivity { this.application = (Application) getApplication(); this.prefs = PreferenceManager.getDefaultSharedPreferences(this); - ErrorReporter.getInstance().check(this, applicationVersionCode(), applicationVersionFlavor(), - application.okHttpClient()); + ErrorReporter.getInstance().check(this, applicationVersionCode(), application.okHttpClient()); } protected void updateFragments(final int listFrameResId, final int mapFrameResId) { @@ -100,10 +99,6 @@ public abstract class OeffiActivity extends ComponentActivity { return Application.versionCode(application); } - protected final String applicationVersionFlavor() { - return Application.versionFlavor(application); - } - protected final long applicationFirstInstallTime() { return application.packageInfo().firstInstallTime; } diff --git a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java index 8a648ac..1d3bba0 100644 --- a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java +++ b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java @@ -341,18 +341,11 @@ public abstract class OeffiMainActivity extends OeffiActivity { private void downloadAndProcessMessages(final String network) { final HttpUrl.Builder remoteUrl = Constants.MESSAGES_BASE_URL.newBuilder(); - final StringBuilder remoteFileName = new StringBuilder("messages"); - final String flavor = applicationVersionFlavor(); - if (flavor != null) - remoteFileName.append('-').append(flavor); - remoteFileName.append(".txt"); - remoteUrl.addPathSegment(remoteFileName.toString()); + remoteUrl.addPathSegment("messages.txt"); final String installerPackageName = Installer.installerPackageName(this); if (installerPackageName != null) remoteUrl.addEncodedQueryParameter("installer", installerPackageName); remoteUrl.addQueryParameter("version", Integer.toString(versionCode)); - if (flavor != null) - remoteUrl.addQueryParameter("flavor", flavor); remoteUrl.addQueryParameter("sdk", Integer.toString(Build.VERSION.SDK_INT)); remoteUrl.addQueryParameter("task", taskName()); final File localFile = new File(getFilesDir(), "messages.txt"); diff --git a/oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java b/oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java index 4ffd60e..a7cc80a 100644 --- a/oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java +++ b/oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java @@ -315,15 +315,12 @@ public class ErrorReporter implements Thread.UncaughtExceptionHandler { private final static Pattern PATTERN_VERSION = Pattern.compile("
([^<]*)
"); - public void check(final Context context, final int applicationVersionCode, final String applicationVersionFlavor, - final OkHttpClient okHttpClient) { + public void check(final Context context, final int applicationVersionCode, final OkHttpClient okHttpClient) { if (!stackTraceFile.exists()) return; final HttpUrl.Builder url = HttpUrl.parse(context.getString(R.string.about_changelog_summary)).newBuilder(); url.addQueryParameter("version", Integer.toString(applicationVersionCode)); - if (applicationVersionFlavor != null) - url.addQueryParameter("flavor", applicationVersionFlavor); url.addQueryParameter("sdk", Integer.toString(Build.VERSION.SDK_INT)); url.addQueryParameter("check", null); final Request.Builder request = new Request.Builder().url(url.build()); diff --git a/settings.gradle b/settings.gradle index 930ac5a..7fe5e56 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,8 +9,7 @@ if (GradleVersion.current() < minGradleVersion || GradleVersion.current() >= max throw new GradleScriptException("build requires Gradle between ${minGradleVersion.version} (including) and ${maxGradleVersion.version} (excluding)", null) gradle.startParameter.excludedTaskNames << "lint" -gradle.startParameter.excludedTaskNames << ":oeffi:lintVitalAospRelease" -gradle.startParameter.excludedTaskNames << ":oeffi:lintVitalGoogleRelease" +gradle.startParameter.excludedTaskNames << ":oeffi:lintVitalRelease" include 'oeffi' include 'public-transport-enabler' From df63f54ab1dec09b1d6dac2e3e6dc471eb33995e Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 12 Jun 2024 18:17:18 +0200 Subject: [PATCH 068/111] build.Containerfile: reference build to use OpenJDK 17 --- build.Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.Containerfile b/build.Containerfile index a33b6a7..39577c6 100644 --- a/build.Containerfile +++ b/build.Containerfile @@ -14,12 +14,12 @@ # directory. Use `apksigner` to sign before installing via `adb install`. # -FROM debian:bullseye-backports AS build-stage +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-11-jdk-headless gradle sdkmanager && \ + /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 && \ From b1e17c5795f47c9033ecef4ab680c1fa2a169d40 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 12 Jun 2024 18:43:41 +0200 Subject: [PATCH 069/111] .gitlab-ci.yml: remove builds based on OpenJDK 11 or on Ubuntu The reference build is now using OpenJDK 17 on Debian Bookworm. --- .gitlab-ci.yml | 39 --------------------------------------- 1 file changed, 39 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f04863e..69b5f38 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,19 +19,6 @@ reference: paths: - build/** -bullseye-jdk11: - image: debian:bullseye-backports - script: - - apt-get update - - apt-get -y install openjdk-11-jdk-headless gradle sdkmanager - - yes | sdkmanager --licenses >/dev/null || true - - gradle build --stacktrace - - gradle --version - artifacts: - name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA - paths: - - oeffi/build/outputs/apk/**/*.apk - bookworm-jdk17: image: debian:bookworm-slim script: @@ -44,29 +31,3 @@ bookworm-jdk17: name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA paths: - oeffi/build/outputs/apk/**/*.apk - -jammy-jdk11: - image: ubuntu:jammy - script: - - apt-get update - - apt-get -y install openjdk-11-jdk-headless gradle sdkmanager - - yes | sdkmanager --licenses >/dev/null || true - - gradle build --stacktrace - - gradle --version - artifacts: - name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA - paths: - - oeffi/build/outputs/apk/**/*.apk - -lunar-jdk17: - image: ubuntu:lunar - script: - - apt-get update - - apt-get -y install openjdk-17-jdk-headless gradle sdkmanager - - yes | sdkmanager --licenses >/dev/null || true - - gradle build --stacktrace - - gradle --version - artifacts: - name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA - paths: - - oeffi/build/outputs/apk/**/*.apk From 4a17ef441f6ca29bfef11714fb13cf1d087b93e4 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 12 Jun 2024 19:14:36 +0200 Subject: [PATCH 070/111] AndroidManifest.xml: require Android 7.0 (Nougat) --- oeffi/AndroidManifest.xml | 2 +- oeffi/src/de/schildbach/oeffi/OeffiActivity.java | 8 -------- .../schildbach/oeffi/network/NetworkPickerActivity.java | 8 -------- .../de/schildbach/oeffi/preference/CommonFragment.java | 3 --- oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java | 3 +-- 5 files changed, 2 insertions(+), 22 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 0986153..ac194ca 100644 --- a/oeffi/AndroidManifest.xml +++ b/oeffi/AndroidManifest.xml @@ -24,7 +24,7 @@ android:versionName="12.1.21"> diff --git a/oeffi/src/de/schildbach/oeffi/OeffiActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiActivity.java index 04c5e2b..a4f76a1 100644 --- a/oeffi/src/de/schildbach/oeffi/OeffiActivity.java +++ b/oeffi/src/de/schildbach/oeffi/OeffiActivity.java @@ -17,12 +17,10 @@ package de.schildbach.oeffi; -import android.annotation.TargetApi; import android.app.ActivityManager.TaskDescription; import android.content.SharedPreferences; import android.content.res.Resources; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.text.format.DateUtils; @@ -152,10 +150,4 @@ public abstract class OeffiActivity extends ComponentActivity { return str; } - - @TargetApi(24) - @Override - public boolean isInMultiWindowMode() { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && super.isInMultiWindowMode(); - } } diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java index f18c129..ba5c8fd 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java @@ -18,7 +18,6 @@ package de.schildbach.oeffi.network; import android.Manifest; -import android.annotation.TargetApi; import android.app.ActivityManager.TaskDescription; import android.content.Context; import android.content.Intent; @@ -29,7 +28,6 @@ import android.content.res.Resources; import android.location.Address; import android.location.Criteria; import android.location.LocationManager; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.HandlerThread; @@ -571,10 +569,4 @@ public class NetworkPickerActivity extends ComponentActivity implements Location actionBar.setBackgroundColor(color); setTaskDescription(new TaskDescription(null, null, color)); } - - @TargetApi(24) - @Override - public boolean isInMultiWindowMode() { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && super.isInMultiWindowMode(); - } } diff --git a/oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java b/oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java index cd73015..9486a15 100644 --- a/oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java +++ b/oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java @@ -17,7 +17,6 @@ package de.schildbach.oeffi.preference; -import android.os.Build; import android.os.Bundle; import android.preference.PreferenceFragment; import de.schildbach.oeffi.R; @@ -25,13 +24,11 @@ import de.schildbach.oeffi.R; import javax.annotation.Nullable; public class CommonFragment extends PreferenceFragment { - private static final String KEY_BATTERY_OPTIMIZATIONS = "battery_optimizations"; @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.preference_common); - findPreference(KEY_BATTERY_OPTIMIZATIONS).setEnabled(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M); } } diff --git a/oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java b/oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java index a7cc80a..cbc90ce 100644 --- a/oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java +++ b/oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java @@ -181,8 +181,7 @@ public class ErrorReporter implements Thread.UncaughtExceptionHandler { report.append("Manufacturer: " + Build.MANUFACTURER + "\n"); report.append("Phone Model: " + Build.MODEL + "\n"); report.append("Android Version: " + Build.VERSION.RELEASE + "\n"); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) - report.append("Android security patch level: ").append(Build.VERSION.SECURITY_PATCH).append("\n"); + report.append("Android security patch level: ").append(Build.VERSION.SECURITY_PATCH).append("\n"); report.append("ABIs: ").append(Joiner.on(", ").skipNulls().join(Strings.emptyToNull(Build.CPU_ABI), Strings.emptyToNull(Build.CPU_ABI2))).append("\n"); report.append("Board: " + Build.BOARD + "\n"); From 05d3623c3440f6a960bffbd4b4574ca2221a2998 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 12 Jun 2024 21:33:58 +0200 Subject: [PATCH 071/111] 13.0 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index ac194ca..5196ee1 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="120121" - android:versionName="12.1.21"> + android:versionCode="130000" + android:versionName="13.0"> Date: Tue, 25 Jun 2024 18:44:06 +0200 Subject: [PATCH 072/111] plans-index.txt: sync plans metadata --- oeffi/assets/plans-index.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/oeffi/assets/plans-index.txt b/oeffi/assets/plans-index.txt index 8a86281..c4bb1a5 100644 --- a/oeffi/assets/plans-index.txt +++ b/oeffi/assets/plans-index.txt @@ -32,6 +32,7 @@ leipzig_tag|51.345476,12.379382|2020-11-18|Leipzig Linien Tag|Leipziger Verkehrs leipzig_nacht|51.345476,12.379382|2020-11-18|Leipzig Linien Nacht|Leipziger Verkehrsbetriebe GmbH halle_tag|51.477347,11.985263|2020-08-27|Halle Linien Tag|SWH/HAVAG halle_nacht|51.477347,11.985263|2020-08-27|Halle Linien Nacht|SWH/HAVAG +jena|50.9248984,11.587666|2024|Jena|Jenaer Nahverkehr GmbH muenchen_schnellbahn|48.140377,11.560643|2019-12|München Schnellbahn|MVV muenchen_tram_metrobus|48.140377,11.560643|2019-12-15|München Tram/MetroBus|MVV/MVG muenchen_nacht|48.140377,11.560643|2019-12-15|München Nachtnetz|MVG @@ -63,8 +64,8 @@ hamburg_usar|53.552946,10.006782|2023-12-10|Hamburg Schnellbahn/Regional|HVV hamburg_metrobus_gross|53.552946,10.006782|2023-12-10|Hamburg MetroBus Liniennetz|HVV hamburg_region|53.552946,10.006782|2023-12-10|Hamburg Regionalverkehr|HVV hamburg_weiss_bus|53.552946,10.006782|2024-01-08|Hamburg Busliniennetz|Lucas Weiss -kiel_liniennetz|54.313282,10.132341|2019-12|Kiel Liniennetz|KVG -kiel_nacht|54.313282,10.132341|2019-12|Kiel Nachtliniennetz|KVG +kiel_liniennetz|54.313282,10.132341|2023-12|Kiel Liniennetz|KVG +kiel_nacht|54.313282,10.132341|2022-12|Kiel Nachtliniennetz|KVG luebeck_region|53.858795,10.664646|2018-12-09|Lübeck Liniennetz Region|LVG, nah.sh, Stadtverkehr Lübeck||SH rostock_vvw_liniennetz|54.078139,12.131724|2023-08-28|Rostock Liniennetz|Verkehrsverbund Warnow rostock_vvw_region|54.078139,12.131724|2023-08-28|Rostock Region|Verkehrsverbund Warnow @@ -106,6 +107,7 @@ rmv_nacht|50.106318,8.662139|2020-12-13|Rhein-Main Nachtnetz|RMV mainz|50.001395,8.258818|2019-12-15|Mainz Tag|Mainzer Verkehrsgesellschaft mbH mainz_nacht|50.001395,8.258818|2019-12-15|Mainz Nacht|Mainzer Verkehrsgesellschaft mbH koeln_schnellverkehr|50.943579,6.95796|2019-12-15|Köln Schnellverkehr|Verkehrsverbund Rhein-Sieg GmbH +koeln_stadtbahn|50.943579,6.95796|2024-04-02|Köln Stadtbahn|Kölner Verkehrs-Betriebe AG koeln_bus|50.943579,6.95796|2019-12-15|Köln Busnetz|Verkehrsverbund Rhein-Sieg GmbH bonn_schnellverkehr|50.732784,7.096447|2019-12-15|Bonn Schnellverkehr|Verkehrsverbund Rhein-Sieg GmbH bonn_bus|50.732784,7.096447|2019-12-15|Bonn Busnetz|Verkehrsverbund Rhein-Sieg GmbH From abb468772d5a5e8685c475b72b32f82631cc5bba Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 25 Jun 2024 18:54:05 +0200 Subject: [PATCH 073/111] 13.0.1 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 5196ee1..62f886f 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="130000" - android:versionName="13.0"> + android:versionCode="130001" + android:versionName="13.0.1"> Date: Fri, 12 Jul 2024 16:29:38 +0200 Subject: [PATCH 074/111] AndroidManifest.xml: use flag `android:showWhenLocked` to show activities in front of lock screen Previously, it was setting `FLAG_SHOW_WHEN_LOCKED` in code. --- oeffi/AndroidManifest.xml | 10 ++++++---- .../oeffi/directions/TripDetailsActivity.java | 6 ------ oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java | 6 ------ .../oeffi/stations/StationDetailsActivity.java | 6 ------ 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 62f886f..b5e9746 100644 --- a/oeffi/AndroidManifest.xml +++ b/oeffi/AndroidManifest.xml @@ -116,8 +116,8 @@ android:exported="true" android:configChanges="keyboard|keyboardHidden" android:label="@string/station_details_activity_title" - android:taskAffinity="de.schildbach.oeffi.stations"> - + android:taskAffinity="de.schildbach.oeffi.stations" + android:showWhenLocked="true" /> + android:taskAffinity="de.schildbach.oeffi.directions" + android:showWhenLocked="true" /> + android:theme="@style/My.Theme.Fullscreen" + android:showWhenLocked="true"> diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java index 10b5f51..5d08c9b 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java @@ -44,7 +44,6 @@ import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.WindowManager; import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.PopupMenu; @@ -366,11 +365,6 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen super.onDestroy(); } - @Override - public void onAttachedToWindow() { - getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); - } - @Override public void onConfigurationChanged(final Configuration config) { super.onConfigurationChanged(config); diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java index 15a4591..58d2bfd 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java @@ -29,7 +29,6 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.Process; import android.view.View; -import android.view.WindowManager; import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.PopupMenu; @@ -255,11 +254,6 @@ public class PlanActivity extends ComponentActivity { super.onDestroy(); } - @Override - public void onAttachedToWindow() { - getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); - } - @Override public boolean onSearchRequested() { if (!stations.isEmpty()) diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java index 4ff6e10..1f2ced8 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java @@ -34,7 +34,6 @@ import android.text.format.DateUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.WindowManager; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.ViewAnimator; @@ -258,11 +257,6 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa super.onDestroy(); } - @Override - public void onAttachedToWindow() { - getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); - } - @Override public void onConfigurationChanged(final Configuration config) { super.onConfigurationChanged(config); From e66388c60d3963683c4c6855f45324ae60ca5000 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 9 Aug 2024 12:27:25 +0200 Subject: [PATCH 075/111] networks.txt: remove Finland --- oeffi/assets/networks.txt | 3 --- oeffi/res/values-de/networks.xml | 2 -- oeffi/res/values/networks.xml | 2 -- oeffi/src/de/schildbach/oeffi/Application.java | 6 ++++++ .../de/schildbach/oeffi/network/NetworkProviderFactory.java | 3 --- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt index 538933b..9355a38 100644 --- a/oeffi/assets/networks.txt +++ b/oeffi/assets/networks.txt @@ -73,9 +73,6 @@ DSB|da-DK|DK;København # SE SE|sv-SE|SE;Stockholm -# FI -FINLAND|fi-FI|FI;Helsinki|beta - # GB 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 diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml index 73c1612..9545206 100644 --- a/oeffi/res/values-de/networks.xml +++ b/oeffi/res/values-de/networks.xml @@ -101,8 +101,6 @@ Fern-, Regional und Lokalverkehr (z.B. Kopenhagen) Schweden Fern-, Regional und Lokalverkehr (z.B. Stockholm) - Finnland - Fern-, Regional und Lokalverkehr (z.B. Helsinki) England, Schottland & Wales. Lokal- und Regionalverkehr (z.B. London, Birmingham) Liverpool diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml index c9035c3..8915363 100644 --- a/oeffi/res/values/networks.xml +++ b/oeffi/res/values/networks.xml @@ -101,8 +101,6 @@ long-distance, regional and local (e.g. Copenhagen) Sweden long-distance, regional and local (e.g. Stockholm) - Finland - long-distance, regional and local (e.g. Helsinki) England, Scotland & Wales local and regional (e.g. London, Birmingham) Liverpool diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java index 6196856..bae1145 100644 --- a/oeffi/src/de/schildbach/oeffi/Application.java +++ b/oeffi/src/de/schildbach/oeffi/Application.java @@ -119,6 +119,12 @@ public class Application extends android.app.Application { FavoriteStationsProvider.migrateFavoriteStationIds(this, NetworkId.MVV, "0", "10000", 91000000); QueryHistoryProvider.migrateQueryHistoryIds(this, NetworkId.MVV, "0", "10000", 91000000); + // 2024-08-09: migrate Finland to use RT + final String FINLAND = "FINLAND"; + migrateSelectedNetwork(FINLAND, NetworkId.RT); + FavoriteStationsProvider.deleteFavoriteStations(this, FINLAND); + QueryHistoryProvider.deleteQueryHistory(this, FINLAND); + log.info("Migrations took {}", watch); } diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index 2d16419..03ce9e1 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -32,7 +32,6 @@ import de.schildbach.pte.DbProvider; import de.schildbach.pte.DingProvider; import de.schildbach.pte.DsbProvider; import de.schildbach.pte.DubProvider; -import de.schildbach.pte.FinlandProvider; import de.schildbach.pte.GvhProvider; import de.schildbach.pte.InvgProvider; import de.schildbach.pte.ItalyProvider; @@ -190,8 +189,6 @@ public final class NetworkProviderFactory { return new DsbProvider("{\"type\":\"AID\",\"aid\":\"irkmpm9mdznstenr-android\"}"); else if (networkId.equals(NetworkId.SE)) return new SeProvider("{\"type\":\"AID\",\"aid\":\"h5o3n7f4t2m8l9x1\"}"); - else if (networkId.equals(NetworkId.FINLAND)) - return new FinlandProvider(NAVITIA_AUTHORIZATION); else if (networkId.equals(NetworkId.TLEM)) return new TlemProvider(); else if (networkId.equals(NetworkId.MERSEY)) From 558e1a6cc489ee483b4597fe014a4f56c8a78657 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 29 Aug 2024 20:17:12 +0200 Subject: [PATCH 076/111] build.gradle: update SDK Build Tools to 35.0.0 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 9672ca7..1f33dc4 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -35,7 +35,7 @@ dependencies { android { compileSdkVersion 'android-34' - buildToolsVersion '34.0.0' + buildToolsVersion '35.0.0' defaultConfig { generatedDensities = ['hdpi', 'xhdpi'] From 9197bdbe1a23e1438abcc6ff1e974eed9e4ab0ed Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 29 Aug 2024 20:18:23 +0200 Subject: [PATCH 077/111] build.gradle: update AndroidX Annotation to 1.8.2 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 1f33dc4..64e36da 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -15,7 +15,7 @@ dependencies { implementation(project(':public-transport-enabler')) { exclude group: 'org.slf4j', module: 'slf4j-api' } - implementation 'androidx.annotation:annotation:1.8.0' + implementation 'androidx.annotation:annotation:1.8.2' implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' From 078b07340d28ff25b4fae573e701580199f00b73 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 29 Aug 2024 20:19:21 +0200 Subject: [PATCH 078/111] build.gradle: update AndroidX Activity to 1.9.1 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 64e36da..2164ae5 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' implementation 'androidx.core:core:1.13.1' - implementation 'androidx.activity:activity:1.9.0' + implementation 'androidx.activity:activity:1.9.1' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.13' //noinspection GradleDependency From d4060f75891ce3e19e3b5285321c335973631ecf Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 29 Aug 2024 20:22:42 +0200 Subject: [PATCH 079/111] build.gradle: update Guava to 33.3.0-android --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 2164ae5..01e4eab 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.2.1-android' + implementation 'com.google.guava:guava:33.3.0-android' implementation 'org.osmdroid:osmdroid-android:6.1.17' //noinspection GradleDependency implementation 'org.slf4j:slf4j-api:2.0.9' From 562d118e79bdab3371ca35c20dfd364beb8302e9 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 29 Aug 2024 20:24:00 +0200 Subject: [PATCH 080/111] build.gradle: update osmdroid to 6.1.20 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 01e4eab..d59712e 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -26,7 +26,7 @@ dependencies { //noinspection GradleDependency implementation 'com.squareup.okhttp3:logging-interceptor:3.12.13' implementation 'com.google.guava:guava:33.3.0-android' - implementation 'org.osmdroid:osmdroid-android:6.1.17' + implementation 'org.osmdroid:osmdroid-android:6.1.20' //noinspection GradleDependency implementation 'org.slf4j:slf4j-api:2.0.9' implementation 'com.github.tony19:logback-android:3.0.0' From efa91b4c67d5edcf81477c01995960e8f620b048 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 29 Aug 2024 20:32:33 +0200 Subject: [PATCH 081/111] 13.0.2 --- 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 b5e9746..40af12e 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="130001" - android:versionName="13.0.1"> + android:versionCode="130002" + android:versionName="13.0.2"> Date: Fri, 30 Aug 2024 17:29:11 +0200 Subject: [PATCH 082/111] adapt to: AbstractNavitiaProvider: remove all providers based on Navitia --- oeffi/assets/networks.txt | 15 ---------- oeffi/res/values-de/networks.xml | 10 ------- oeffi/res/values/networks.xml | 10 ------- .../src/de/schildbach/oeffi/Application.java | 30 +++++++++++++++++++ .../oeffi/network/NetworkPickerActivity.java | 5 ---- .../oeffi/network/NetworkProviderFactory.java | 16 ---------- 6 files changed, 30 insertions(+), 56 deletions(-) diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt index 9355a38..d66c4f9 100644 --- a/oeffi/assets/networks.txt +++ b/oeffi/assets/networks.txt @@ -45,22 +45,10 @@ VVT|de-AT|Tirol|disabled SVV|de-AT|Salzburg|disabled VMOBIL|de-AT|Vorarlberg;Bregenz|disabled -# CZ -CZECH_REPUBLIC|cs-CZ|Tschechien;Praha;Prag|beta - # CH VBL|de-CH|Luzern ZVV|de-CH|Zürich -# IT -IT|it-IT|IT|alpha - -# FR -PARIS|fr-FR|FR|alpha - -# ES -SPAIN|es-ES|ES|alpha - # LU LU|lb-LU|LU;Luxemburg @@ -88,6 +76,3 @@ CMTA|us-US|US;Texas;Austin|beta # AU SYDNEY|en-AU|AU;New South Wales;Sydney MET|en-AU|AU;Victoria;Melbourne|disabled - -# NI -NICARAGUA|es-NI|NI;Managua|beta diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml index 9545206..591b3c3 100644 --- a/oeffi/res/values-de/networks.xml +++ b/oeffi/res/values-de/networks.xml @@ -81,18 +81,10 @@ Lokal- und Regionalverkehr Bregenz & Vorarlberg Nicht verfügbar, weil der VVV ausdrücklich darum gebeten hat, nicht in Öffi enthalten zu sein. Du kannst stattdessen die ÖBB verwenden, das funktioniert für Vorarlberg auch gut. - Prag - Lokal- und Regionalverkehr Luzern nur Tram und Bus Zürich Lokal- und Regionalverkehr - Italien - Fern-, Regional und Lokalverkehr (z.B. Mailand, Rom, Neapel) - Paris - Lokal- und Regionalverkehr - Spanien - Lokal- und Regionalverkehr (z.B. Barcelona) Luxemburg Lokal- und Regionalverkehr Niederlande @@ -115,8 +107,6 @@ Lokal- und Regionalverkehr Sydney Lokal- und Regionalverkehr - Nicaragua - nationale und städtische Buslinien Melbourne Nicht mehr verfügbar, da der PTV keine EFA-API mehr anbietet. diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml index 8915363..e7a6def 100644 --- a/oeffi/res/values/networks.xml +++ b/oeffi/res/values/networks.xml @@ -81,18 +81,10 @@ local and regional Bregenz & Vorarlberg Not available, because the VVV explicitly desires not to be included in Offi. You can use the ÖBB instead, it works well for Vorarlberg too. - Prague - local and regional Lucerne tram and bus only Zurich local and regional - Italy - long-distance, regional and local (e.g. Milan, Rome, Naples) - Paris - local and regional - Spain - local and regional (e.g. Barcelona) Luxembourg local and regional Netherlands @@ -115,8 +107,6 @@ local and regional Sydney local and regional - Nicaragua - national and urban buses Melbourne Not available, because the PTV does not offer an EFA API any more. diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java index bae1145..1b00c67 100644 --- a/oeffi/src/de/schildbach/oeffi/Application.java +++ b/oeffi/src/de/schildbach/oeffi/Application.java @@ -125,6 +125,36 @@ public class Application extends android.app.Application { FavoriteStationsProvider.deleteFavoriteStations(this, FINLAND); QueryHistoryProvider.deleteQueryHistory(this, FINLAND); + // 2024-08-30: migrate Czech Republic to use RT + final String CZECH_REPUBLIC = "CZECH_REPUBLIC"; + migrateSelectedNetwork(CZECH_REPUBLIC, NetworkId.RT); + FavoriteStationsProvider.deleteFavoriteStations(this, CZECH_REPUBLIC); + QueryHistoryProvider.deleteQueryHistory(this, CZECH_REPUBLIC); + + // 2024-08-30: migrate Italy to use RT + final String IT = "IT"; + migrateSelectedNetwork(IT, NetworkId.RT); + FavoriteStationsProvider.deleteFavoriteStations(this, IT); + QueryHistoryProvider.deleteQueryHistory(this, IT); + + // 2024-08-30: migrate Paris to use RT + final String PARIS = "PARIS"; + migrateSelectedNetwork(PARIS, NetworkId.RT); + FavoriteStationsProvider.deleteFavoriteStations(this, PARIS); + QueryHistoryProvider.deleteQueryHistory(this, PARIS); + + // 2024-08-30: migrate Spain to use RT + final String SPAIN = "SPAIN"; + migrateSelectedNetwork(SPAIN, NetworkId.RT); + FavoriteStationsProvider.deleteFavoriteStations(this, SPAIN); + QueryHistoryProvider.deleteQueryHistory(this, SPAIN); + + // 2024-08-30: migrate Nicaragua to use RT + final String NICARAGUA = "NICARAGUA"; + migrateSelectedNetwork(NICARAGUA, NetworkId.RT); + FavoriteStationsProvider.deleteFavoriteStations(this, NICARAGUA); + QueryHistoryProvider.deleteQueryHistory(this, NICARAGUA); + log.info("Migrations took {}", watch); } diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java index ba5c8fd..cab21f6 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java @@ -56,7 +56,6 @@ import de.schildbach.oeffi.network.list.NetworksAdapter; import de.schildbach.oeffi.util.DividerItemDecoration; import de.schildbach.oeffi.util.GeocoderThread; import de.schildbach.oeffi.util.LocationHelper; -import de.schildbach.pte.AbstractNavitiaProvider; import de.schildbach.pte.NetworkId; import de.schildbach.pte.NetworkProvider; import de.schildbach.pte.dto.Location; @@ -475,10 +474,6 @@ public class NetworkPickerActivity extends ComponentActivity implements Location final NetworkProvider networkProvider = NetworkProviderFactory.provider(NetworkId.valueOf(network.id)); - // workaround, because of network access for navitia - if (AbstractNavitiaProvider.class.isAssignableFrom(networkProvider.getClass())) - return false; - boolean inArea = false; final Point[] area = getArea(networkProvider); diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index 03ce9e1..eb54880 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -27,14 +27,12 @@ import de.schildbach.pte.BayernProvider; import de.schildbach.pte.BsvagProvider; import de.schildbach.pte.BvgProvider; import de.schildbach.pte.CmtaProvider; -import de.schildbach.pte.CzechRepublicProvider; import de.schildbach.pte.DbProvider; import de.schildbach.pte.DingProvider; import de.schildbach.pte.DsbProvider; import de.schildbach.pte.DubProvider; import de.schildbach.pte.GvhProvider; import de.schildbach.pte.InvgProvider; -import de.schildbach.pte.ItalyProvider; import de.schildbach.pte.KvvProvider; import de.schildbach.pte.LinzProvider; import de.schildbach.pte.LuProvider; @@ -44,17 +42,14 @@ import de.schildbach.pte.MvvProvider; import de.schildbach.pte.NasaProvider; import de.schildbach.pte.NetworkId; import de.schildbach.pte.NetworkProvider; -import de.schildbach.pte.NicaraguaProvider; import de.schildbach.pte.NsProvider; import de.schildbach.pte.NvbwProvider; import de.schildbach.pte.NvvProvider; import de.schildbach.pte.OebbProvider; -import de.schildbach.pte.ParisProvider; import de.schildbach.pte.RtProvider; import de.schildbach.pte.RtaChicagoProvider; import de.schildbach.pte.SeProvider; import de.schildbach.pte.ShProvider; -import de.schildbach.pte.SpainProvider; import de.schildbach.pte.StvProvider; import de.schildbach.pte.SydneyProvider; import de.schildbach.pte.TlemProvider; @@ -83,7 +78,6 @@ public final class NetworkProviderFactory { private static final BaseEncoding BASE64 = BaseEncoding.base64(); private static final String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36 Edg/108.0.1462.54"; - private static final String NAVITIA_AUTHORIZATION = "577e5781-23ee-4ff0-a5b3-92e5b04887e5"; // oeffi@schildbach.de private static final byte[] VRS_CLIENT_CERTIFICATE = BASE64.decode("MIILOQIBAzCCCv8GCSqGSIb3DQEHAaCCCvAEggrsMIIK6DCCBZ8GCSqGSIb3DQEHBqCCBZAwggWMAgEAMIIFhQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQITP1aoTF3ISwCAggAgIIFWBba5Nms7ssWBgCkVFboVo4EQSGNe6GvJLvlAIAPGBieMyQOeJJwDJgl422+dzIAr+wxYNTgXMBMf7ZwPpVLUyCECGcePHfbLKyAK5CqvP+zYdGYc8oHF5JcukK2wm0oCxt4sRvPKAimFjU1NWFVzX8HY8dTYia59nOF1dk7LmfA5wI8Jr2YURB71lycHLvm4KbBl23AZmEgaAGWPcHhzPFfslo8arlixKGJqc02Tq9gA0+ZY/nkvNtl7fEbVJkHXF7QP7D5O7N5T6D2THyad9rqVdS499VwQ16b5lBTgV5vWD5Ctf5riuewc4aUziGLnukBrHgWOHK8TfsAhtTOrUerAFLNVB2jF6nBKbgywBXKYOBDhKX3MdVmt3srkq0/Ta2+bxUHfwRt17EQKFzboiNuraALs2jXrbSHvuO+pV2yj0WP/sX8d6KXf3XMFejynv7Os7sD0mQTcllsN9bf2oGVUnSaHT97RAekYxaF7LX+q94rhXmhpFPH/ILQEt92lF+nk+XlmhlGT9SUhwUJ6AKysFRY7si/ofE+8V4ZFHDnyjoUNDhOUYC/Z4I7YpozuPECPKNReTbPdHXqlBIiEx243gutskl8duiGYEv7TzraAq0Nag6Xk8YcXoyMXGC8wrecU7Uts9Tm2OBErAqxvFWXL9eN/EsYV8SB745tmU+T4EqJDDZQZnRAerg7Ms4iSKSbPNj/OtwpIptv43NWAtyzEEc6NxwwQTIJZL0v9jwB0mUY7TgM4a+VwMTBHcBNZH5+x8dpwh1H8MYh91UaBOidbc2PJeLtT4pIxYlcyYGl9LJa68WgzBkc7uJmETNOfKfdJEazLvH/jIRsLBwzPj/pbJDPER82wC8l5mmbOyNa/vgjsSAvm2uYDsV1fo8xdik3q/SFRHseIf2vQtybDXrytafUb9D6/0puTycMo5IfXegHvuwIJVhYFcqoCDX8VkkebHHWdWelr7yPealzjksddiJ9a4mksc4js3g7if5cQwYkfiVNE2FQukkjJx1xhgRCsnTRv1K0n0t1g4D5CD4oYjTBiYzgF/t2CqH85wNAVKnJmKNyt0Weqcf6GQwu0oVC+9IqSAiy07KvEbLxjjqcBarQjGKPSLmJeQ0x9X+9KIaEKG3gdN5l8ptlfHhML2wZsn0cTCBU1otOdLcu4QmBGf6DSTSCXcH4GGvlWdxjxdQ7Docmdp3hQBh8wY7jRST+YWcp5zQWkOpClFjKIKx2s+0sG7XM+LNPr2zSJZTyLcPlqdc9aam9LL3nf3CUtUNVrDaiyfTYhgpBHkwc+4P8MIsaZy8gowfBhovsYvfE5aFzF3rfLf30r31/ju/jkcfnWW995X+AJb8pcQuC6R7xJ82lZyPRpyfs96eCmizjIcAcL6Wz+SQEsUE3zNuH/ctpqhD5gCKXhJTj6sXjdiGNkYqPyxKX3blw8fdh+nIe3kBdC9deaw4S+5QYNKPSmdmQAAaOxOyzLi+DKgR9bV6SzWUAO/kWCdRaCdCDy9WS+6CQ2AVsQOSYv1vBMWkZ0u5/EHqPsb6y1wtXvE0/s7T4KZi7taP/72dDclPgNHsWCW5HbSaeyx83efu3fpX7i8tsWmr+QeeRuLGJ5z0NOBKasIKhCe3XPWZGNzKNca0WJk7UWepYFfiPv57tFj6Y0zautFHFNRgP+iu0hX7nNNn0AVXjuFFiZ/fwhjFmXExSYG9xSzcR5aJha0GEJ+MQbIZD7/Ay8GRmPFrrN8x40svTfiWu71qpxqsfco+2sKhJtBxJoO/cnjRz5PrtCdnqi4dYHtvOAyjaaF/3hQvDyiEoiDuxTPIVyjCCBUEGCSqGSIb3DQEHAaCCBTIEggUuMIIFKjCCBSYGCyqGSIb3DQEMCgECoIIE7jCCBOowHAYKKoZIhvcNAQwBAzAOBAg71M5exZmMVQICCAAEggTIohxJ2uLoi9RYzxe7t0XOHkTBSI+/Rn3oQNecNuMe/YNpMMsRCQjSOJToWHGayBQJmwSkMd3NP4QnDfqWFIxHbgnfj3FLTIyfkDIObzpfHwLCOrYHQxK9Zr4t/0SfEy/34uH40ZEiPe7Mnn/iTTZy37ecZgLsvlr6wp5Gao3oBjhKZlxJM043Hy9Dk1vtRCRIFCFbdGXtcLnuVKASc+GVw6QJKoXLerImV0U5Pg6khh0huTALEULuvq5cEIlKBNqyZ37cfb3Cvf9mWSTferBcUymGyHtdh+mHtVPb3ZycprtFmKcGMR9bXK0FJ63fERmXRHBN1ZKVC0beWVgcGybDQKdx9Y26UQLtO3xdZK0Eb3Kn8jVJG3sEJi2u3CLS4wD533+jj+b1uuL8Uj/aZy2UvrbIez48JStZgBGg+IhLK5keW7KV1lHiOVwZuWERpxzbNx7jaZRWIUCwN+aMJts1d5aY+wYvlJ9uk2lQc8qpIDIHHXHvyUEnk7jxw88gQjNgo1lvUHewiQk6VBwXX7EII0kLxdNfEpBT9RAdqURqy8dpoQemoc2zwce0e14G+IElJ1ES1j2jMYkYuggjpfUJBc34QrQI2a7UQwloUMwkdoi9nwgnpeL5G3Jyvgfxxf+D9xSXh8auH5IsdO0/enDGo/Xo+ygQ3tgY3dGI02frzRF24i4hFp/FAdbLjytjgCF0KIEXbJylEweZX2g61jL/fJVowJIA3wXDSuIBq9YRdpEA2OhgCdpwcz69W9T5lVfuJBgKOKcFKSQgDm0sEEkcUV9WR4CWfC9lZ+haHvNcrJBsRkHg6KKsV8PwwbUs2WeXl3NvGnJ/kSQbqJOLfURPziY9w4phupuSTAqmQIc0D4MSZLEjDcXKjg3ifFi4NlGLy+iyzGBoC1YZk1OOlO3uhKxxSD8FG6ncRGHEr8OU+2Yj/qubqZMpckPLXPdWbZB24bQxPTKGeQjFGlgt95H3/aRK9FzmBLc1FOe4qnT9chzbewsAnuho+F7Rqe36hPCZHlIrND0RCOdTAw7buJg6yPIbpDA41SpvS1F/BdFuDepf4yd0NWt4N46zUHmpxavv+2zmDiAUG95ZQ7AmkAA39tc+XtQv3IhLK6Wa7joM61jtau34td3vi1RvN2fPY2jQqOvKA2/hTVw5SzWCI0Tl7le6+ol1/QeUJfpjBZl6Ai+ydgVycSXuyq+MXB/UUEWo8RmlX8R9+y2KtCGV0TQjfX/um1D77LzurRO430m2pggcxmdCiFyl4CRp+rXhw7W6nGwLqZfD2msKthh+tn2QxoNII1oGHHsF7fxE/E4wm54IGtqfLM5pV/5hrqgVfTetABMLFEbtIHrxEDms80SyvsP2/JgelFFrs90wZr9QkLVBBQtZpwmLu39u24HlGXhZflXX0fmlHT2vN1e/EH43Nl/iPgZPYTj6fGGJFdaKNm0QlLym2M0btN3MNMXHETUoLDOg17AomH3NRvSIARu92qa48rX+SeCdF0NJ3VmA2I3Fl4A47epkmMcCzF078UVPC2eQ9M2NtxIAsqQnfIFfxirTuSCdeVS06n8KbMi7PG4Luc7IUPr4W3SQ9mY8XjFgRjVl86QpExzE6P5WZ/RDrgaypcDED6BvMSUwIwYJKoZIhvcNAQkVMRYEFKkQDH5bs77hmpmQ899BQPMX5lIDMDEwITAJBgUrDgMCGgUABBSqWv+fwvAy3ohpbmU2hfBpJbEejAQIPczIVgsfvYECAggA"); public static synchronized NetworkProvider provider(final NetworkId networkId) { @@ -169,18 +163,10 @@ public final class NetworkProviderFactory { return new LinzProvider(); else if (networkId.equals(NetworkId.STV)) return new StvProvider(); - else if (networkId.equals(NetworkId.CZECH_REPUBLIC)) - return new CzechRepublicProvider(NAVITIA_AUTHORIZATION); else if (networkId.equals(NetworkId.VBL)) return new VblProvider(); else if (networkId.equals(NetworkId.ZVV)) return new ZvvProvider("{\"type\":\"AID\",\"aid\":\"hf7mcf9bv3nv8g5f\"}"); - else if (networkId.equals(NetworkId.IT)) - return new ItalyProvider(NAVITIA_AUTHORIZATION); - else if (networkId.equals(NetworkId.PARIS)) - return new ParisProvider(NAVITIA_AUTHORIZATION); - else if (networkId.equals(NetworkId.SPAIN)) - return new SpainProvider(NAVITIA_AUTHORIZATION); else if (networkId.equals(NetworkId.LU)) return new LuProvider("{\"type\":\"AID\",\"aid\":\"SkC81GuwuzL4e0\"}"); else if (networkId.equals(NetworkId.NS)) @@ -203,8 +189,6 @@ public final class NetworkProviderFactory { return new CmtaProvider("{\"type\":\"AID\",\"aid\":\"web9j2nak29uz41irb\"}"); else if (networkId.equals(NetworkId.SYDNEY)) return new SydneyProvider(); - else if (networkId.equals(NetworkId.NICARAGUA)) - return new NicaraguaProvider(NAVITIA_AUTHORIZATION); else throw new IllegalArgumentException(networkId.name()); } From 4357b7a0df446f0b66d82c14774388f479ba32f3 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 30 Aug 2024 20:20:36 +0200 Subject: [PATCH 083/111] 13.0.3 --- 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 40af12e..17412f7 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="130002" - android:versionName="13.0.2"> + android:versionCode="130003" + android:versionName="13.0.3"> Date: Tue, 15 Oct 2024 21:22:57 +0200 Subject: [PATCH 084/111] AndroidManifest.xml: target Android 15 --- oeffi/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 17412f7..adb1641 100644 --- a/oeffi/AndroidManifest.xml +++ b/oeffi/AndroidManifest.xml @@ -25,7 +25,7 @@ + android:targetSdkVersion="35" /> From 335fdea1f803877185720534ae7a45daa6698b8f Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 15 Oct 2024 21:23:55 +0200 Subject: [PATCH 085/111] build.gradle: update AndroidX Activity to 1.9.2 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index d59712e..df5b2b2 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' implementation 'androidx.core:core:1.13.1' - implementation 'androidx.activity:activity:1.9.1' + implementation 'androidx.activity:activity:1.9.2' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.13' //noinspection GradleDependency From 2e00027604a40e484a534c61fe5a1a35c1da2999 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 16 Oct 2024 14:43:31 +0200 Subject: [PATCH 086/111] 13.0.4 --- 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 adb1641..48bd4e2 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="130003" - android:versionName="13.0.3"> + android:versionCode="130004" + android:versionName="13.0.4"> Date: Sat, 19 Oct 2024 19:36:55 +0200 Subject: [PATCH 087/111] PreferenceActivity: fix broken edge-to-edge layout in settings --- .../oeffi/preference/PreferenceActivity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java b/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java index 182a1c0..faf02a1 100644 --- a/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java +++ b/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java @@ -19,6 +19,7 @@ package de.schildbach.oeffi.preference; import android.app.Activity; import android.content.Intent; +import android.os.Bundle; import android.view.MenuItem; import de.schildbach.oeffi.R; @@ -35,6 +36,16 @@ public class PreferenceActivity extends android.preference.PreferenceActivity { activity.startActivity(intent); } + @Override + public void onCreate(final Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { + v.setPadding(v.getPaddingLeft(), insets.getSystemWindowInsetTop(), v.getPaddingRight(), + v.getPaddingBottom()); + return insets; + }); + } + @Override public void onBuildHeaders(final List
target) { loadHeadersFromResource(R.xml.preference_headers, target); From 2a1cc53180abde367a6c0384556f29786424395d Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 19 Oct 2024 20:55:04 +0200 Subject: [PATCH 088/111] OeffiActivity: migrate to `EdgeToEdge` helper for enabling edge-to-edge layout Previously, we were enabling edge-to-edge via system UI layout flag and we were setting system bar colors via style attributes. --- oeffi/res/values-night-v29/colors.xml | 9 --------- oeffi/res/values-night/colors.xml | 1 - oeffi/res/values-night/styles.xml | 4 ---- oeffi/res/values-notnight-v29/styes.xml | 2 -- oeffi/res/values-v29/colors.xml | 9 --------- oeffi/res/values/colors.xml | 3 --- oeffi/res/values/styles.xml | 7 ------- oeffi/src/de/schildbach/oeffi/OeffiActivity.java | 4 ++++ .../schildbach/oeffi/directions/DirectionsActivity.java | 1 - .../schildbach/oeffi/directions/TripDetailsActivity.java | 1 - .../oeffi/directions/TripsOverviewActivity.java | 1 - .../schildbach/oeffi/network/NetworkPickerActivity.java | 4 ++++ oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java | 5 ++++- .../de/schildbach/oeffi/plans/PlansPickerActivity.java | 1 - .../oeffi/stations/FavoriteStationsActivity.java | 2 -- .../oeffi/stations/StationDetailsActivity.java | 1 - .../de/schildbach/oeffi/stations/StationsActivity.java | 1 - 17 files changed, 12 insertions(+), 44 deletions(-) delete mode 100644 oeffi/res/values-night-v29/colors.xml delete mode 100644 oeffi/res/values-v29/colors.xml diff --git a/oeffi/res/values-night-v29/colors.xml b/oeffi/res/values-night-v29/colors.xml deleted file mode 100644 index 1734f89..0000000 --- a/oeffi/res/values-night-v29/colors.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - @android:color/transparent - @android:color/transparent - @android:color/transparent - - diff --git a/oeffi/res/values-night/colors.xml b/oeffi/res/values-night/colors.xml index a0653fd..179b8b9 100644 --- a/oeffi/res/values-night/colors.xml +++ b/oeffi/res/values-night/colors.xml @@ -23,7 +23,6 @@ #444444 #ffff00 #bbbbbb - #44000000 0.8 diff --git a/oeffi/res/values-night/styles.xml b/oeffi/res/values-night/styles.xml index 4ef9f8d..f80397d 100644 --- a/oeffi/res/values-night/styles.xml +++ b/oeffi/res/values-night/styles.xml @@ -5,8 +5,6 @@ diff --git a/oeffi/res/values-notnight-v29/styes.xml b/oeffi/res/values-notnight-v29/styes.xml index 6cf7297..92f8177 100644 --- a/oeffi/res/values-notnight-v29/styes.xml +++ b/oeffi/res/values-notnight-v29/styes.xml @@ -4,8 +4,6 @@ diff --git a/oeffi/res/values-v29/colors.xml b/oeffi/res/values-v29/colors.xml deleted file mode 100644 index 1734f89..0000000 --- a/oeffi/res/values-v29/colors.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - @android:color/transparent - @android:color/transparent - @android:color/transparent - - diff --git a/oeffi/res/values/colors.xml b/oeffi/res/values/colors.xml index dd27815..255d6ee 100644 --- a/oeffi/res/values/colors.xml +++ b/oeffi/res/values/colors.xml @@ -37,9 +37,6 @@ #757575 #bbbbbb #ff4444 - #44000000 - @android:color/black - #44000000 1 diff --git a/oeffi/res/values/styles.xml b/oeffi/res/values/styles.xml index 727a1f6..8a913e7 100644 --- a/oeffi/res/values/styles.xml +++ b/oeffi/res/values/styles.xml @@ -5,8 +5,6 @@ @@ -27,13 +23,10 @@ diff --git a/oeffi/src/de/schildbach/oeffi/OeffiActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiActivity.java index a4f76a1..2a6edc4 100644 --- a/oeffi/src/de/schildbach/oeffi/OeffiActivity.java +++ b/oeffi/src/de/schildbach/oeffi/OeffiActivity.java @@ -20,6 +20,7 @@ package de.schildbach.oeffi; import android.app.ActivityManager.TaskDescription; import android.content.SharedPreferences; import android.content.res.Resources; +import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.preference.PreferenceManager; @@ -29,6 +30,8 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; import androidx.activity.ComponentActivity; +import androidx.activity.EdgeToEdge; +import androidx.activity.SystemBarStyle; import de.schildbach.oeffi.network.NetworkResources; import de.schildbach.oeffi.util.ErrorReporter; import de.schildbach.pte.NetworkId; @@ -44,6 +47,7 @@ public abstract class OeffiActivity extends ComponentActivity { @Override protected void onCreate(final Bundle savedInstanceState) { + EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT)); super.onCreate(savedInstanceState); this.application = (Application) getApplication(); this.prefs = PreferenceManager.getDefaultSharedPreferences(this); diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java index 7d1b8a8..4fcfd0a 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java @@ -307,7 +307,6 @@ public class DirectionsActivity extends OeffiMainActivity implements QueryHistor backgroundHandler = new Handler(backgroundThread.getLooper()); setContentView(R.layout.directions_content); - getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); return insets; diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java index 5d08c9b..4345fd0 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java @@ -186,7 +186,6 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen scheduleTripIntent = scheduleTripIntent(trip); setContentView(R.layout.directions_trip_details_content); - getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); return insets; diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java index ad62ea8..f90d1e9 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java @@ -130,7 +130,6 @@ public class TripsOverviewActivity extends OeffiActivity { final Uri historyUri = historyUriStr != null ? Uri.parse(historyUriStr) : null; setContentView(R.layout.directions_trip_overview_content); - getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); return insets; diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java index cab21f6..d01551f 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java @@ -25,6 +25,7 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.content.res.Resources; +import android.graphics.Color; import android.location.Address; import android.location.Criteria; import android.location.LocationManager; @@ -38,6 +39,8 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; import androidx.activity.ComponentActivity; +import androidx.activity.EdgeToEdge; +import androidx.activity.SystemBarStyle; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.core.content.ContextCompat; @@ -109,6 +112,7 @@ public class NetworkPickerActivity extends ComponentActivity implements Location @Override protected void onCreate(final Bundle savedInstanceState) { + EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT)); super.onCreate(savedInstanceState); prefs = PreferenceManager.getDefaultSharedPreferences(this); diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java index 58d2bfd..01d7efa 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java @@ -23,6 +23,7 @@ import android.content.Intent; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.Color; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -35,6 +36,8 @@ import android.widget.PopupMenu; import android.widget.TextView; import android.widget.ViewAnimator; import androidx.activity.ComponentActivity; +import androidx.activity.EdgeToEdge; +import androidx.activity.SystemBarStyle; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -116,6 +119,7 @@ public class PlanActivity extends ComponentActivity { @Override protected void onCreate(final Bundle savedInstanceState) { + EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT)); super.onCreate(savedInstanceState); this.application = (Application) getApplication(); @@ -125,7 +129,6 @@ public class PlanActivity extends ComponentActivity { backgroundHandler = new Handler(backgroundThread.getLooper()); setContentView(R.layout.plans_content); - getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); final Animation zoomControlsAnimation = AnimationUtils.loadAnimation(this, R.anim.zoom_controls); zoomControlsAnimation.setFillAfter(true); // workaround: set through code because XML does not work diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java index 58e29db..e1bb2ef 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java @@ -110,7 +110,6 @@ public class PlansPickerActivity extends OeffiMainActivity implements LocationHe thumbCache = new Cache(cacheDir, THUMB_CACHE_SIZE); setContentView(R.layout.plans_picker_content); - getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); return insets; diff --git a/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java index 87ea4ed..4e4d191 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.view.View; import android.widget.ViewAnimator; import androidx.activity.result.contract.ActivityResultContract; import androidx.recyclerview.widget.LinearLayoutManager; @@ -84,7 +83,6 @@ public class FavoriteStationsActivity extends OeffiActivity network = (NetworkId) intent.getSerializableExtra(INTENT_EXTRA_NETWORK); setContentView(R.layout.favorites_content); - getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); return insets; diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java index 1f2ced8..78abb26 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java @@ -137,7 +137,6 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa backgroundHandler = new Handler(backgroundThread.getLooper()); setContentView(R.layout.stations_station_details_content); - getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); return insets; diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java index 2596490..0447cff 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java @@ -184,7 +184,6 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware res = getResources(); setContentView(R.layout.stations_content); - getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); return insets; From eb23268ebc83bc555810e6dcfcfafe3a65c81f5c Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 19 Oct 2024 21:36:29 +0200 Subject: [PATCH 089/111] 13.0.5 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 48bd4e2..bcc8202 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="130004" - android:versionName="13.0.4"> + android:versionCode="130005" + android:versionName="13.0.5"> Date: Sun, 20 Oct 2024 12:08:33 +0200 Subject: [PATCH 090/111] NetworkPickerActivity: remove setting of system UI layout flag This was overseen in the recent migration. --- oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java index d01551f..d5e579b 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java @@ -124,7 +124,6 @@ public class NetworkPickerActivity extends ComponentActivity implements Location backgroundHandler = new Handler(backgroundThread.getLooper()); setContentView(R.layout.network_picker_content); - getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); return insets; From 99b737f2378333bc4180b77ab6fa14b34606eb7c Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 20 Oct 2024 12:10:44 +0200 Subject: [PATCH 091/111] Constants: move status bar style as a constant from activities --- oeffi/src/de/schildbach/oeffi/Constants.java | 4 ++++ oeffi/src/de/schildbach/oeffi/OeffiActivity.java | 3 +-- .../de/schildbach/oeffi/network/NetworkPickerActivity.java | 3 +-- oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java | 3 +-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/oeffi/src/de/schildbach/oeffi/Constants.java b/oeffi/src/de/schildbach/oeffi/Constants.java index 203d40f..3394e43 100644 --- a/oeffi/src/de/schildbach/oeffi/Constants.java +++ b/oeffi/src/de/schildbach/oeffi/Constants.java @@ -17,7 +17,9 @@ package de.schildbach.oeffi; +import android.graphics.Color; import android.text.format.DateUtils; +import androidx.activity.SystemBarStyle; import okhttp3.HttpUrl; import java.util.Locale; @@ -65,4 +67,6 @@ public class Constants { public static final String DESTINATION_ARROW_PREFIX = Character.toString(Constants.CHAR_RIGHTWARDS_ARROW) + Constants.CHAR_THIN_SPACE; public static final String DESTINATION_ARROW_INVISIBLE_PREFIX = " "; + + public static final SystemBarStyle STATUS_BAR_STYLE = SystemBarStyle.dark(Color.TRANSPARENT); } diff --git a/oeffi/src/de/schildbach/oeffi/OeffiActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiActivity.java index 2a6edc4..5b66bc6 100644 --- a/oeffi/src/de/schildbach/oeffi/OeffiActivity.java +++ b/oeffi/src/de/schildbach/oeffi/OeffiActivity.java @@ -31,7 +31,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.activity.ComponentActivity; import androidx.activity.EdgeToEdge; -import androidx.activity.SystemBarStyle; import de.schildbach.oeffi.network.NetworkResources; import de.schildbach.oeffi.util.ErrorReporter; import de.schildbach.pte.NetworkId; @@ -47,7 +46,7 @@ public abstract class OeffiActivity extends ComponentActivity { @Override protected void onCreate(final Bundle savedInstanceState) { - EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT)); + EdgeToEdge.enable(this, Constants.STATUS_BAR_STYLE); super.onCreate(savedInstanceState); this.application = (Application) getApplication(); this.prefs = PreferenceManager.getDefaultSharedPreferences(this); diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java index d5e579b..23e5757 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java @@ -40,7 +40,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.activity.ComponentActivity; import androidx.activity.EdgeToEdge; -import androidx.activity.SystemBarStyle; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.core.content.ContextCompat; @@ -112,7 +111,7 @@ public class NetworkPickerActivity extends ComponentActivity implements Location @Override protected void onCreate(final Bundle savedInstanceState) { - EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT)); + EdgeToEdge.enable(this, Constants.STATUS_BAR_STYLE); super.onCreate(savedInstanceState); prefs = PreferenceManager.getDefaultSharedPreferences(this); diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java index 01d7efa..ec92162 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java @@ -37,7 +37,6 @@ import android.widget.TextView; import android.widget.ViewAnimator; import androidx.activity.ComponentActivity; import androidx.activity.EdgeToEdge; -import androidx.activity.SystemBarStyle; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -119,7 +118,7 @@ public class PlanActivity extends ComponentActivity { @Override protected void onCreate(final Bundle savedInstanceState) { - EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT)); + EdgeToEdge.enable(this, Constants.STATUS_BAR_STYLE); super.onCreate(savedInstanceState); this.application = (Application) getApplication(); From c5ee0db526b63aa69c165f520f568e147dc7461d Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 20 Oct 2024 12:20:03 +0200 Subject: [PATCH 092/111] PlanActivity: force navigation bar to light mode for plans The rationale being that plan backgrounds are always white. --- oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java index ec92162..1310d4d 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java @@ -37,6 +37,7 @@ import android.widget.TextView; import android.widget.ViewAnimator; import androidx.activity.ComponentActivity; import androidx.activity.EdgeToEdge; +import androidx.activity.SystemBarStyle; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -84,6 +85,9 @@ public class PlanActivity extends ComponentActivity { public static final String INTENT_EXTRA_PLAN_ID = "plan_id"; // Used in launcher shortcuts private static final String INTENT_EXTRA_SELECTED_STATION_ID = PlanActivity.class.getName() + ".selected_station_id"; + // plan backgrounds are always white, so force navigation bar to light mode + private static final SystemBarStyle NAVIGATION_BAR_STYLE = SystemBarStyle.light(Color.TRANSPARENT, + Color.TRANSPARENT); public static Intent intent(final Context context, final String planId, final String selectedStationId) { final Intent intent = new Intent(Intent.ACTION_VIEW, null, context, PlanActivity.class); @@ -118,7 +122,7 @@ public class PlanActivity extends ComponentActivity { @Override protected void onCreate(final Bundle savedInstanceState) { - EdgeToEdge.enable(this, Constants.STATUS_BAR_STYLE); + EdgeToEdge.enable(this, Constants.STATUS_BAR_STYLE, NAVIGATION_BAR_STYLE); super.onCreate(savedInstanceState); this.application = (Application) getApplication(); From 0bd83c012591c9f38497a0a1c548a376efedc808 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 20 Oct 2024 13:06:11 +0200 Subject: [PATCH 093/111] plans_content.xml: use a light gray background for plans The contrast used to be a bit too harsh. --- oeffi/res/layout/plans_content.xml | 3 ++- oeffi/res/values/colors.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/oeffi/res/layout/plans_content.xml b/oeffi/res/layout/plans_content.xml index cf96dae..58d2e48 100644 --- a/oeffi/res/layout/plans_content.xml +++ b/oeffi/res/layout/plans_content.xml @@ -4,6 +4,7 @@ android:id="@+id/plans_layout" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/bg_plan" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out"> @@ -24,7 +25,7 @@ android:layout_height="wrap_content" android:paddingTop="8dp" android:text="@string/plan_progress_loading" - android:textColor="@color/fg_significant_on_dark" + android:textColor="@color/fg_significant_on_light" android:textStyle="bold" /> diff --git a/oeffi/res/values/colors.xml b/oeffi/res/values/colors.xml index 255d6ee..5f9c7e5 100644 --- a/oeffi/res/values/colors.xml +++ b/oeffi/res/values/colors.xml @@ -37,6 +37,7 @@ #757575 #bbbbbb #ff4444 + #ffd8d8d8 1 From 3b80a7a3b47bc708f0ca4ca36931d435bbd0f5b9 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 29 Oct 2024 16:07:08 +0100 Subject: [PATCH 094/111] build.gradle: update AndroidX Activity to 1.9.3 --- oeffi/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index df5b2b2..a62bfaf 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' implementation 'androidx.core:core:1.13.1' - implementation 'androidx.activity:activity:1.9.2' + implementation 'androidx.activity:activity:1.9.3' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.13' //noinspection GradleDependency From ce7fedc76e4d4bf4d44413ec0a5a620acbdb1b2e Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 29 Oct 2024 16:40:23 +0100 Subject: [PATCH 095/111] StationsActivity, StationDetailsActivity, FavoriteStationsActivity, DirectionsActivity, TripsOverviewActivity, TripDetailsActivity, PlansPickerActivity, NetworkPickerActivity, PreferenceActivity: use ViewCompat.setOnApplyWindowInsetsListener() rather than View.setOnApplyWindowInsetsListener() --- .../oeffi/directions/DirectionsActivity.java | 31 ++++++++------ .../oeffi/directions/TripDetailsActivity.java | 26 +++++++----- .../directions/TripsOverviewActivity.java | 19 ++++++--- .../oeffi/network/NetworkPickerActivity.java | 26 +++++++----- .../oeffi/plans/PlansPickerActivity.java | 19 +++++---- .../oeffi/preference/PreferenceActivity.java | 13 ++++-- .../stations/FavoriteStationsActivity.java | 20 ++++++---- .../stations/StationDetailsActivity.java | 33 +++++++++------ .../oeffi/stations/StationsActivity.java | 40 ++++++++++++------- 9 files changed, 145 insertions(+), 82 deletions(-) diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java index 4fcfd0a..1da216c 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java @@ -63,7 +63,9 @@ import androidx.activity.result.contract.ActivityResultContract; import androidx.activity.result.contract.ActivityResultContracts; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.content.ContextCompat; +import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.google.common.base.Throwables; @@ -307,9 +309,11 @@ public class DirectionsActivity extends OeffiMainActivity implements QueryHistor backgroundHandler = new Handler(backgroundThread.getLooper()); setContentView(R.layout.directions_content); - findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); - return insets; + final View contentView = findViewById(android.R.id.content); + ViewCompat.setOnApplyWindowInsetsListener(contentView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(insets.left, 0, insets.right, 0); + return windowInsets; }); final MyActionBar actionBar = getMyActionBar(); @@ -455,10 +459,11 @@ public class DirectionsActivity extends OeffiMainActivity implements QueryHistor viewQueryHistoryList.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL_LIST)); queryHistoryListAdapter = new QueryHistoryAdapter(this, network, this, this); viewQueryHistoryList.setAdapter(queryHistoryListAdapter); - viewQueryHistoryList.setOnApplyWindowInsetsListener((v, insets) -> { + ViewCompat.setOnApplyWindowInsetsListener(viewQueryHistoryList, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); v.setPadding(v.getPaddingLeft(), v.getPaddingTop(), v.getPaddingRight(), - insets.getSystemWindowInsetBottom()); - return insets; + insets.bottom); + return windowInsets; }); viewQueryHistoryEmpty = findViewById(R.id.directions_query_history_empty); @@ -545,15 +550,17 @@ public class DirectionsActivity extends OeffiMainActivity implements QueryHistor }); final TextView mapDisclaimerView = findViewById(R.id.directions_map_disclaimer); mapDisclaimerView.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); - mapDisclaimerView.setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(0,0,0, insets.getSystemWindowInsetBottom()); - return insets; + ViewCompat.setOnApplyWindowInsetsListener(mapDisclaimerView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(0, 0, 0, insets.bottom); + return windowInsets; }); final ZoomControls zoom = findViewById(R.id.directions_map_zoom); - zoom.setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); - return insets; + ViewCompat.setOnApplyWindowInsetsListener(zoom, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(0, 0, 0, insets.bottom); + return windowInsets; }); mapView.setZoomControls(zoom); diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java index 4345fd0..8372c16 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java @@ -50,6 +50,9 @@ import android.widget.PopupMenu; import android.widget.TableLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; import com.google.common.base.MoreObjects; import de.schildbach.oeffi.Constants; import de.schildbach.oeffi.LocationAware; @@ -186,9 +189,11 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen scheduleTripIntent = scheduleTripIntent(trip); setContentView(R.layout.directions_trip_details_content); - findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); - return insets; + final View contentView = findViewById(android.R.id.content); + ViewCompat.setOnApplyWindowInsetsListener(contentView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(insets.left, 0, insets.right, 0); + return windowInsets; }); final MyActionBar actionBar = getMyActionBar(); @@ -281,9 +286,11 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen ((TextView) findViewById(R.id.directions_trip_details_footer)) .setText(Html.fromHtml(getString(R.string.directions_trip_details_realtime))); - findViewById(R.id.directions_trip_details_disclaimer_group).setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); - return insets; + final View disclaimerView = findViewById(R.id.directions_trip_details_disclaimer_group); + ViewCompat.setOnApplyWindowInsetsListener(disclaimerView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(0, 0, 0, insets.bottom); + return windowInsets; }); final TextView disclaimerSourceView = findViewById(R.id.directions_trip_details_disclaimer_source); updateDisclaimerSource(disclaimerSourceView, network.name(), null); @@ -312,9 +319,10 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen }); final TextView mapDisclaimerView = findViewById(R.id.directions_trip_details_map_disclaimer); mapDisclaimerView.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); - mapDisclaimerView.setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(0,0,0, insets.getSystemWindowInsetBottom()); - return insets; + ViewCompat.setOnApplyWindowInsetsListener(mapDisclaimerView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(0, 0, 0, insets.bottom); + return windowInsets; }); } diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java index f90d1e9..b0f8247 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java @@ -31,6 +31,9 @@ import android.text.format.DateUtils; import android.view.View; import android.widget.AdapterView; import android.widget.TextView; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; import com.google.common.collect.ComparisonChain; import com.google.common.collect.Ordering; import com.google.common.util.concurrent.Uninterruptibles; @@ -130,9 +133,11 @@ public class TripsOverviewActivity extends OeffiActivity { final Uri historyUri = historyUriStr != null ? Uri.parse(historyUriStr) : null; setContentView(R.layout.directions_trip_overview_content); - findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); - return insets; + final View contentView = findViewById(android.R.id.content); + ViewCompat.setOnApplyWindowInsetsListener(contentView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(insets.left, 0, insets.right, 0); + return windowInsets; }); final MyActionBar actionBar = getMyActionBar(); @@ -163,9 +168,11 @@ public class TripsOverviewActivity extends OeffiActivity { }); barView.setOnScrollListener(() -> handler.post(checkMoreRunnable)); - findViewById(R.id.directions_trip_overview_disclaimer_group).setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); - return insets; + final View disclaimerView = findViewById(R.id.directions_trip_overview_disclaimer_group); + ViewCompat.setOnApplyWindowInsetsListener(disclaimerView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(0, 0, 0, insets.bottom); + return windowInsets; }); processResult(result, dep); diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java index 23e5757..e5e49fc 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java @@ -43,6 +43,9 @@ import androidx.activity.EdgeToEdge; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.core.content.ContextCompat; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import de.schildbach.oeffi.AreaAware; @@ -123,9 +126,11 @@ public class NetworkPickerActivity extends ComponentActivity implements Location backgroundHandler = new Handler(backgroundThread.getLooper()); setContentView(R.layout.network_picker_content); - findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); - return insets; + final View contentView = findViewById(android.R.id.content); + ViewCompat.setOnApplyWindowInsetsListener(contentView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(insets.left, 0, insets.right, 0); + return windowInsets; }); actionBar = findViewById(R.id.action_bar); @@ -138,18 +143,19 @@ public class NetworkPickerActivity extends ComponentActivity implements Location final String network = prefsGetNetwork(); listAdapter = new NetworksAdapter(this, network, this, this); listView.setAdapter(listAdapter); - listView.setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(v.getPaddingLeft(), v.getPaddingTop(), v.getPaddingRight(), - insets.getSystemWindowInsetBottom()); - return insets; + ViewCompat.setOnApplyWindowInsetsListener(listView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(v.getPaddingLeft(), v.getPaddingTop(), v.getPaddingRight(), insets.bottom); + return windowInsets; }); mapView = findViewById(R.id.network_picker_map); final TextView mapDisclaimerView = findViewById(R.id.network_picker_map_disclaimer); mapDisclaimerView.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); - mapDisclaimerView.setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); - return insets; + ViewCompat.setOnApplyWindowInsetsListener(mapDisclaimerView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(0, 0, 0, insets.bottom); + return windowInsets; }); if (network != null) { diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java index e1bb2ef..1440601 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java @@ -38,7 +38,10 @@ import androidx.activity.result.contract.ActivityResultContracts; import androidx.core.content.ContextCompat; import androidx.core.content.pm.ShortcutInfoCompat; import androidx.core.content.pm.ShortcutManagerCompat; +import androidx.core.graphics.Insets; import androidx.core.graphics.drawable.IconCompat; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.google.common.util.concurrent.FutureCallback; @@ -110,9 +113,11 @@ public class PlansPickerActivity extends OeffiMainActivity implements LocationHe thumbCache = new Cache(cacheDir, THUMB_CACHE_SIZE); setContentView(R.layout.plans_picker_content); - findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); - return insets; + final View contentView = findViewById(android.R.id.content); + ViewCompat.setOnApplyWindowInsetsListener(contentView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(insets.left, 0, insets.right, 0); + return windowInsets; }); actionBar = getMyActionBar(); @@ -130,10 +135,10 @@ public class PlansPickerActivity extends OeffiMainActivity implements LocationHe listView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL_LIST)); listAdapter = new PlansAdapter(this, cursor, thumbCache, this, this, application.okHttpClient()); listView.setAdapter(listAdapter); - listView.setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(v.getPaddingLeft(), v.getPaddingTop(), v.getPaddingRight(), - insets.getSystemWindowInsetBottom()); - return insets; + ViewCompat.setOnApplyWindowInsetsListener(listView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(v.getPaddingLeft(), v.getPaddingTop(), v.getPaddingRight(), insets.bottom); + return windowInsets; }); connectivityWarningView = findViewById(R.id.plans_picker_connectivity_warning_box); diff --git a/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java b/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java index faf02a1..2ee2611 100644 --- a/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java +++ b/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java @@ -21,6 +21,10 @@ import android.app.Activity; import android.content.Intent; import android.os.Bundle; import android.view.MenuItem; +import android.view.View; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; import de.schildbach.oeffi.R; import java.util.List; @@ -39,10 +43,11 @@ public class PreferenceActivity extends android.preference.PreferenceActivity { @Override public void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); - findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(v.getPaddingLeft(), insets.getSystemWindowInsetTop(), v.getPaddingRight(), - v.getPaddingBottom()); - return insets; + final View contentView = findViewById(android.R.id.content); + ViewCompat.setOnApplyWindowInsetsListener(contentView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(v.getPaddingLeft(), insets.top, v.getPaddingRight(), v.getPaddingBottom()); + return windowInsets; }); } diff --git a/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java index 4e4d191..729d99f 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java @@ -22,8 +22,12 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.view.View; import android.widget.ViewAnimator; import androidx.activity.result.contract.ActivityResultContract; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import de.schildbach.oeffi.MyActionBar; @@ -83,9 +87,11 @@ public class FavoriteStationsActivity extends OeffiActivity network = (NetworkId) intent.getSerializableExtra(INTENT_EXTRA_NETWORK); setContentView(R.layout.favorites_content); - findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); - return insets; + final View contentView = findViewById(android.R.id.content); + ViewCompat.setOnApplyWindowInsetsListener(contentView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(insets.left, 0, insets.right, 0); + return windowInsets; }); final MyActionBar actionBar = getMyActionBar(); @@ -100,10 +106,10 @@ public class FavoriteStationsActivity extends OeffiActivity listView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL_LIST)); adapter = new FavoriteStationsAdapter(this, network, this, network == null ? this : null); listView.setAdapter(adapter); - listView.setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(v.getPaddingLeft(), v.getPaddingTop(), v.getPaddingRight(), - insets.getSystemWindowInsetBottom()); - return insets; + ViewCompat.setOnApplyWindowInsetsListener(listView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(v.getPaddingLeft(), v.getPaddingTop(), v.getPaddingRight(), insets.bottom); + return windowInsets; }); updateGUI(); diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java index 78abb26..b77f1ca 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java @@ -37,6 +37,9 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.ViewAnimator; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.google.common.base.Joiner; @@ -137,9 +140,11 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa backgroundHandler = new Handler(backgroundThread.getLooper()); setContentView(R.layout.stations_station_details_content); - findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); - return insets; + final View contentView = findViewById(android.R.id.content); + ViewCompat.setOnApplyWindowInsetsListener(contentView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(insets.left, 0, insets.right, 0); + return windowInsets; }); actionBar = getMyActionBar(); @@ -173,19 +178,21 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa listView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL_LIST)); listAdapter = new DeparturesAdapter(this); listView.setAdapter(listAdapter); - listView.setOnApplyWindowInsetsListener((v, insets) -> { + ViewCompat.setOnApplyWindowInsetsListener(listView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); v.setPadding(v.getPaddingLeft(), v.getPaddingTop(), v.getPaddingRight(), - insets.getSystemWindowInsetBottom() + (int)(48 * getResources().getDisplayMetrics().density)); - return insets; + insets.bottom + (int) (48 * getResources().getDisplayMetrics().density)); + return windowInsets; }); mapView = findViewById(R.id.stations_station_details_map); mapView.setStationsAware(this); final TextView mapDisclaimerView = findViewById(R.id.stations_station_details_map_disclaimer); mapDisclaimerView.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); - mapDisclaimerView.setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(0,0,0, insets.getSystemWindowInsetBottom()); - return insets; + ViewCompat.setOnApplyWindowInsetsListener(mapDisclaimerView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(0, 0, 0, insets.bottom); + return windowInsets; }); resultStatusView = findViewById(R.id.stations_station_details_result_status); @@ -201,9 +208,11 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa favoriteButton .setChecked(selectedFavState != null && selectedFavState == FavoriteStationsProvider.TYPE_FAVORITE); - findViewById(R.id.stations_station_details_disclaimer_group).setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); - return insets; + final View disclaimerView = findViewById(R.id.stations_station_details_disclaimer_group); + ViewCompat.setOnApplyWindowInsetsListener(disclaimerView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(0, 0, 0, insets.bottom); + return windowInsets; }); disclaimerSourceView = findViewById(R.id.stations_station_details_disclaimer_source); updateDisclaimerSource(disclaimerSourceView, selectedNetwork.name(), null); diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java index 0447cff..9cfc18c 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java @@ -56,6 +56,9 @@ import android.widget.ViewAnimator; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.core.content.ContextCompat; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -184,9 +187,11 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware res = getResources(); setContentView(R.layout.stations_content); - findViewById(android.R.id.content).setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), 0); - return insets; + final View contentView = findViewById(android.R.id.content); + ViewCompat.setOnApplyWindowInsetsListener(contentView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(insets.left, 0, insets.right, 0); + return windowInsets; }); actionBar = getMyActionBar(); @@ -265,22 +270,26 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware mapView.setLocationAware(this); final TextView mapDisclaimerView = findViewById(R.id.stations_map_disclaimer); mapDisclaimerView.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); - mapDisclaimerView.setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); - return insets; + ViewCompat.setOnApplyWindowInsetsListener(mapDisclaimerView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(0, 0, 0, insets.bottom); + return windowInsets; }); final ZoomControls zoom = findViewById(R.id.stations_map_zoom); - zoom.setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); - return insets; + ViewCompat.setOnApplyWindowInsetsListener(zoom, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(0, 0, 0, insets.bottom); + return windowInsets; }); mapView.setZoomControls(zoom); connectivityWarningView = findViewById(R.id.stations_connectivity_warning_box); - findViewById(R.id.stations_disclaimer_group).setOnApplyWindowInsetsListener((v, insets) -> { - v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); - return insets; + final View disclaimerView = findViewById(R.id.stations_disclaimer_group); + ViewCompat.setOnApplyWindowInsetsListener(disclaimerView, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(0, 0, 0, insets.bottom); + return windowInsets; }); disclaimerSourceView = findViewById(R.id.stations_disclaimer_source); @@ -414,10 +423,11 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware stationList.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL_LIST)); stationListAdapter = new StationsAdapter(this, maxDeparturesPerStation, products, this, this); stationList.setAdapter(stationListAdapter); - stationList.setOnApplyWindowInsetsListener((v, insets) -> { + ViewCompat.setOnApplyWindowInsetsListener(stationList, (v, windowInsets) -> { + final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); v.setPadding(v.getPaddingLeft(), v.getPaddingTop(), v.getPaddingRight(), - insets.getSystemWindowInsetBottom() + (int)(48 * res.getDisplayMetrics().density)); - return insets; + insets.bottom + (int) (48 * res.getDisplayMetrics().density)); + return windowInsets; }); stationList.addOnScrollListener(new RecyclerView.OnScrollListener() { @Override From 71f315ac596ca6062217bd03561d842510890503 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 2 Nov 2024 12:25:24 +0100 Subject: [PATCH 096/111] 13.0.6 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index bcc8202..d7fb10d 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="130005" - android:versionName="13.0.5"> + android:versionCode="130006" + android:versionName="13.0.6"> Date: Sat, 14 Dec 2024 18:43:08 +0100 Subject: [PATCH 097/111] 13.0.7 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index d7fb10d..afa0a58 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="130006" - android:versionName="13.0.6"> + android:versionCode="130007" + android:versionName="13.0.7"> Date: Tue, 17 Dec 2024 09:46:05 +0100 Subject: [PATCH 098/111] 13.0.8 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index afa0a58..8eb5d4b 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="130007" - android:versionName="13.0.7"> + android:versionCode="130008" + android:versionName="13.0.8"> Date: Sun, 5 Jan 2025 12:37:20 +0100 Subject: [PATCH 099/111] strings.xml: update year of copyright --- oeffi/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/res/values/strings.xml b/oeffi/res/values/strings.xml index e4d1657..6720387 100644 --- a/oeffi/res/values/strings.xml +++ b/oeffi/res/values/strings.xml @@ -46,7 +46,7 @@ About Offi Copyright - © 2010-2024, the Öffi developers + © 2010-2025, the Öffi developers License Privacy Policy https://oeffi.schildbach.de/privacy_policy.txt From 2f158a9b5b9c0dca2193f9ae535a48812ab2e59b Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 11 Jan 2025 10:54:53 +0100 Subject: [PATCH 100/111] adapt to: DB: replace HCI-based implementation with new movas provider --- .../de/schildbach/oeffi/network/NetworkProviderFactory.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index eb54880..73f6d55 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -95,8 +95,7 @@ public final class NetworkProviderFactory { if (networkId.equals(NetworkId.RT)) return new RtProvider(); else if (networkId.equals(NetworkId.DB)) - return new DbProvider("{\"type\":\"AID\",\"aid\":\"n91dB8Z77MLdoR0K\"}", - "bdI8UVj40K5fvxwf".getBytes(Charsets.UTF_8)); + return new DbProvider(); else if (networkId.equals(NetworkId.BVG)) return new BvgProvider("{\"aid\":\"1Rxs112shyHLatUX4fofnmdxK\",\"type\":\"AID\"}"); else if (networkId.equals(NetworkId.VBB)) From d76e35760322a034915e91fb063d9f2d605dc3ae Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 11 Jan 2025 10:56:23 +0100 Subject: [PATCH 101/111] 13.0.9 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index 8eb5d4b..e4b5dd2 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="130008" - android:versionName="13.0.8"> + android:versionCode="130009" + android:versionName="13.0.9"> Date: Sat, 11 Jan 2025 11:32:21 +0100 Subject: [PATCH 102/111] NetworkProviderFactory: update user agent --- .../src/de/schildbach/oeffi/network/NetworkProviderFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index 73f6d55..969d7dc 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -77,7 +77,7 @@ public final class NetworkProviderFactory { private static Map providerCache = new HashMap<>(); private static final BaseEncoding BASE64 = BaseEncoding.base64(); - private static final String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36 Edg/108.0.1462.54"; + private static final String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:134.0) Gecko/20100101 Firefox/134.0"; private static final byte[] VRS_CLIENT_CERTIFICATE = BASE64.decode("MIILOQIBAzCCCv8GCSqGSIb3DQEHAaCCCvAEggrsMIIK6DCCBZ8GCSqGSIb3DQEHBqCCBZAwggWMAgEAMIIFhQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQITP1aoTF3ISwCAggAgIIFWBba5Nms7ssWBgCkVFboVo4EQSGNe6GvJLvlAIAPGBieMyQOeJJwDJgl422+dzIAr+wxYNTgXMBMf7ZwPpVLUyCECGcePHfbLKyAK5CqvP+zYdGYc8oHF5JcukK2wm0oCxt4sRvPKAimFjU1NWFVzX8HY8dTYia59nOF1dk7LmfA5wI8Jr2YURB71lycHLvm4KbBl23AZmEgaAGWPcHhzPFfslo8arlixKGJqc02Tq9gA0+ZY/nkvNtl7fEbVJkHXF7QP7D5O7N5T6D2THyad9rqVdS499VwQ16b5lBTgV5vWD5Ctf5riuewc4aUziGLnukBrHgWOHK8TfsAhtTOrUerAFLNVB2jF6nBKbgywBXKYOBDhKX3MdVmt3srkq0/Ta2+bxUHfwRt17EQKFzboiNuraALs2jXrbSHvuO+pV2yj0WP/sX8d6KXf3XMFejynv7Os7sD0mQTcllsN9bf2oGVUnSaHT97RAekYxaF7LX+q94rhXmhpFPH/ILQEt92lF+nk+XlmhlGT9SUhwUJ6AKysFRY7si/ofE+8V4ZFHDnyjoUNDhOUYC/Z4I7YpozuPECPKNReTbPdHXqlBIiEx243gutskl8duiGYEv7TzraAq0Nag6Xk8YcXoyMXGC8wrecU7Uts9Tm2OBErAqxvFWXL9eN/EsYV8SB745tmU+T4EqJDDZQZnRAerg7Ms4iSKSbPNj/OtwpIptv43NWAtyzEEc6NxwwQTIJZL0v9jwB0mUY7TgM4a+VwMTBHcBNZH5+x8dpwh1H8MYh91UaBOidbc2PJeLtT4pIxYlcyYGl9LJa68WgzBkc7uJmETNOfKfdJEazLvH/jIRsLBwzPj/pbJDPER82wC8l5mmbOyNa/vgjsSAvm2uYDsV1fo8xdik3q/SFRHseIf2vQtybDXrytafUb9D6/0puTycMo5IfXegHvuwIJVhYFcqoCDX8VkkebHHWdWelr7yPealzjksddiJ9a4mksc4js3g7if5cQwYkfiVNE2FQukkjJx1xhgRCsnTRv1K0n0t1g4D5CD4oYjTBiYzgF/t2CqH85wNAVKnJmKNyt0Weqcf6GQwu0oVC+9IqSAiy07KvEbLxjjqcBarQjGKPSLmJeQ0x9X+9KIaEKG3gdN5l8ptlfHhML2wZsn0cTCBU1otOdLcu4QmBGf6DSTSCXcH4GGvlWdxjxdQ7Docmdp3hQBh8wY7jRST+YWcp5zQWkOpClFjKIKx2s+0sG7XM+LNPr2zSJZTyLcPlqdc9aam9LL3nf3CUtUNVrDaiyfTYhgpBHkwc+4P8MIsaZy8gowfBhovsYvfE5aFzF3rfLf30r31/ju/jkcfnWW995X+AJb8pcQuC6R7xJ82lZyPRpyfs96eCmizjIcAcL6Wz+SQEsUE3zNuH/ctpqhD5gCKXhJTj6sXjdiGNkYqPyxKX3blw8fdh+nIe3kBdC9deaw4S+5QYNKPSmdmQAAaOxOyzLi+DKgR9bV6SzWUAO/kWCdRaCdCDy9WS+6CQ2AVsQOSYv1vBMWkZ0u5/EHqPsb6y1wtXvE0/s7T4KZi7taP/72dDclPgNHsWCW5HbSaeyx83efu3fpX7i8tsWmr+QeeRuLGJ5z0NOBKasIKhCe3XPWZGNzKNca0WJk7UWepYFfiPv57tFj6Y0zautFHFNRgP+iu0hX7nNNn0AVXjuFFiZ/fwhjFmXExSYG9xSzcR5aJha0GEJ+MQbIZD7/Ay8GRmPFrrN8x40svTfiWu71qpxqsfco+2sKhJtBxJoO/cnjRz5PrtCdnqi4dYHtvOAyjaaF/3hQvDyiEoiDuxTPIVyjCCBUEGCSqGSIb3DQEHAaCCBTIEggUuMIIFKjCCBSYGCyqGSIb3DQEMCgECoIIE7jCCBOowHAYKKoZIhvcNAQwBAzAOBAg71M5exZmMVQICCAAEggTIohxJ2uLoi9RYzxe7t0XOHkTBSI+/Rn3oQNecNuMe/YNpMMsRCQjSOJToWHGayBQJmwSkMd3NP4QnDfqWFIxHbgnfj3FLTIyfkDIObzpfHwLCOrYHQxK9Zr4t/0SfEy/34uH40ZEiPe7Mnn/iTTZy37ecZgLsvlr6wp5Gao3oBjhKZlxJM043Hy9Dk1vtRCRIFCFbdGXtcLnuVKASc+GVw6QJKoXLerImV0U5Pg6khh0huTALEULuvq5cEIlKBNqyZ37cfb3Cvf9mWSTferBcUymGyHtdh+mHtVPb3ZycprtFmKcGMR9bXK0FJ63fERmXRHBN1ZKVC0beWVgcGybDQKdx9Y26UQLtO3xdZK0Eb3Kn8jVJG3sEJi2u3CLS4wD533+jj+b1uuL8Uj/aZy2UvrbIez48JStZgBGg+IhLK5keW7KV1lHiOVwZuWERpxzbNx7jaZRWIUCwN+aMJts1d5aY+wYvlJ9uk2lQc8qpIDIHHXHvyUEnk7jxw88gQjNgo1lvUHewiQk6VBwXX7EII0kLxdNfEpBT9RAdqURqy8dpoQemoc2zwce0e14G+IElJ1ES1j2jMYkYuggjpfUJBc34QrQI2a7UQwloUMwkdoi9nwgnpeL5G3Jyvgfxxf+D9xSXh8auH5IsdO0/enDGo/Xo+ygQ3tgY3dGI02frzRF24i4hFp/FAdbLjytjgCF0KIEXbJylEweZX2g61jL/fJVowJIA3wXDSuIBq9YRdpEA2OhgCdpwcz69W9T5lVfuJBgKOKcFKSQgDm0sEEkcUV9WR4CWfC9lZ+haHvNcrJBsRkHg6KKsV8PwwbUs2WeXl3NvGnJ/kSQbqJOLfURPziY9w4phupuSTAqmQIc0D4MSZLEjDcXKjg3ifFi4NlGLy+iyzGBoC1YZk1OOlO3uhKxxSD8FG6ncRGHEr8OU+2Yj/qubqZMpckPLXPdWbZB24bQxPTKGeQjFGlgt95H3/aRK9FzmBLc1FOe4qnT9chzbewsAnuho+F7Rqe36hPCZHlIrND0RCOdTAw7buJg6yPIbpDA41SpvS1F/BdFuDepf4yd0NWt4N46zUHmpxavv+2zmDiAUG95ZQ7AmkAA39tc+XtQv3IhLK6Wa7joM61jtau34td3vi1RvN2fPY2jQqOvKA2/hTVw5SzWCI0Tl7le6+ol1/QeUJfpjBZl6Ai+ydgVycSXuyq+MXB/UUEWo8RmlX8R9+y2KtCGV0TQjfX/um1D77LzurRO430m2pggcxmdCiFyl4CRp+rXhw7W6nGwLqZfD2msKthh+tn2QxoNII1oGHHsF7fxE/E4wm54IGtqfLM5pV/5hrqgVfTetABMLFEbtIHrxEDms80SyvsP2/JgelFFrs90wZr9QkLVBBQtZpwmLu39u24HlGXhZflXX0fmlHT2vN1e/EH43Nl/iPgZPYTj6fGGJFdaKNm0QlLym2M0btN3MNMXHETUoLDOg17AomH3NRvSIARu92qa48rX+SeCdF0NJ3VmA2I3Fl4A47epkmMcCzF078UVPC2eQ9M2NtxIAsqQnfIFfxirTuSCdeVS06n8KbMi7PG4Luc7IUPr4W3SQ9mY8XjFgRjVl86QpExzE6P5WZ/RDrgaypcDED6BvMSUwIwYJKoZIhvcNAQkVMRYEFKkQDH5bs77hmpmQ899BQPMX5lIDMDEwITAJBgUrDgMCGgUABBSqWv+fwvAy3ohpbmU2hfBpJbEejAQIPczIVgsfvYECAggA"); public static synchronized NetworkProvider provider(final NetworkId networkId) { From 004f32b2346aac1215668698df9f7f466660d371 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 12 Jan 2025 19:19:21 +0100 Subject: [PATCH 103/111] StationDetailsActivity: fix adapter cutting off one item at the end This bug was reported by "Traines". --- .../de/schildbach/oeffi/stations/StationDetailsActivity.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java index b77f1ca..7c57fe6 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java @@ -433,9 +433,8 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa @Override public int getItemCount() { final List selectedDepartures = StationDetailsActivity.this.selectedDepartures; - if (selectedDepartures == null || selectedDepartures.isEmpty()) - return 1; - return selectedDepartures.size(); + final int numDepartures = selectedDepartures != null ? selectedDepartures.size() : 0; + return numDepartures + 1; // account for header } @Override From d1c124478d5e4ac3456df708b4b82ee1c3339feb Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 13 Jan 2025 12:45:08 +0100 Subject: [PATCH 104/111] 13.0.10 --- oeffi/AndroidManifest.xml | 4 ++-- oeffi/CHANGES | 2 +- public-transport-enabler | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml index e4b5dd2..9c31937 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="130009" - android:versionName="13.0.9"> + android:versionCode="130010" + android:versionName="13.0.10"> Date: Tue, 4 Feb 2025 13:52:31 +0100 Subject: [PATCH 105/111] 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 106/111] 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 107/111] 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 108/111] 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 109/111] 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 110/111] 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 111/111] 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">