diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index d5cb73939..8805a1573 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -19,11 +19,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - distribution: 'zulu' - java-version: '11' + distribution: 'temurin' + java-version: '17' - name: Create empty truststore file run: | diff --git a/.github/workflows/gradle_connected-tests.yml b/.github/workflows/gradle_connected-tests.yml index 9f71f3144..1b46b6b39 100644 --- a/.github/workflows/gradle_connected-tests.yml +++ b/.github/workflows/gradle_connected-tests.yml @@ -27,10 +27,11 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: - distribution: 'zulu' - java-version: '11' + distribution: 'temurin' + java-version: '17' - name: Create empty truststore file run: | diff --git a/.github/workflows/gradle_publish.yml b/.github/workflows/gradle_publish.yml index c8747f636..7d5475bfa 100644 --- a/.github/workflows/gradle_publish.yml +++ b/.github/workflows/gradle_publish.yml @@ -16,11 +16,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - distribution: 'zulu' - java-version: '11' + distribution: 'temurin' + java-version: '17' - name: Create empty truststore file run: | diff --git a/build.gradle b/build.gradle index cc1885a37..a4dbaf1c6 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ */ buildscript { - ext.gradle_version = "7.0.2" + ext.gradle_version = "8.2.2" repositories { google() @@ -43,12 +43,11 @@ ext { cyfaceBackendVersion = "0.0.0" // Cyface dependencies - cyfaceUtilsVersion = "4.0.6" + cyfaceUtilsVersion = "4.0.7" minSdkVersion = 21 targetSdkVersion = 34 compileSdkVersion = 34 - buildToolsVersion = '34.0.0' // Android dependencies androidxAnnotationVersion = "1.6.0" @@ -64,8 +63,8 @@ ext { robolectricVersion = "4.10.2" androidxTestCoreVersion = "1.1.0" - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -94,18 +93,20 @@ allprojects { }*/ } -apply plugin: 'android-reporting' +apply plugin: 'android-reporting' // must be at the end, not working with `plugins {}` // To publish all sub-projects -task publishAll() { +tasks.register('publishAll') { + outputs.upToDateWhen { false } +} +gradle.projectsEvaluated { subprojects.each { pr -> - dependsOn { - pr.tasks.findAll { task -> task.name.startsWith('publish') } + //noinspection ConfigurationAvoidance + pr.tasks.matching { task -> task.name.startsWith('publish') }.all { publishTask -> + tasks.named('publishAll').configure { dependsOn publishTask } } } - outputs.upToDateWhen { false } } -publishAll.outputs.upToDateWhen { false } // Auto-generated by Android Studio task clean(type: Delete) { diff --git a/datacapturing/build.gradle b/datacapturing/build.gradle index fb8351a0c..791c739ae 100644 --- a/datacapturing/build.gradle +++ b/datacapturing/build.gradle @@ -30,8 +30,8 @@ plugins { } android { + namespace "de.cyface.datacapturing" compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion @@ -81,6 +81,10 @@ android { returnDefaultValues = true } } + + buildFeatures { // Required with AGP 8+ + buildConfig = true + } } dependencies { diff --git a/datacapturing/src/main/java/de/cyface/datacapturing/DataCapturingService.java b/datacapturing/src/main/java/de/cyface/datacapturing/DataCapturingService.java index 6901d6569..25a9b359c 100644 --- a/datacapturing/src/main/java/de/cyface/datacapturing/DataCapturingService.java +++ b/datacapturing/src/main/java/de/cyface/datacapturing/DataCapturingService.java @@ -744,6 +744,8 @@ private synchronized void runService(final Measurement measurement, Log.d(TAG, "Starting the background service for measurement " + measurement + "!"); final Intent startIntent = new Intent(context, DataCapturingBackgroundService.class); + // Binding the intent to the package of the app which runs this SDK [DAT-1509]. + startIntent.setPackage(context.getPackageName()); startIntent.putExtra(MEASUREMENT_ID, measurement.getIdentifier()); startIntent.putExtra(AUTHORITY_ID, authority); startIntent.putExtra(EVENT_HANDLING_STRATEGY_ID, eventHandlingStrategy); diff --git a/datacapturing/src/main/java/de/cyface/datacapturing/IgnoreEventsStrategy.java b/datacapturing/src/main/java/de/cyface/datacapturing/IgnoreEventsStrategy.java index e6a786a46..61f5af941 100644 --- a/datacapturing/src/main/java/de/cyface/datacapturing/IgnoreEventsStrategy.java +++ b/datacapturing/src/main/java/de/cyface/datacapturing/IgnoreEventsStrategy.java @@ -86,7 +86,7 @@ public Notification buildCapturingNotification(@NonNull final DataCapturingBackg Validate.notNull(context, "No context provided!"); // The NotificationChannel settings are cached so you need to temporarily change the channel id for testing - final String channelId = context.getString(R.string.cyface_notification_channel_id); + final String channelId = context.getString(de.cyface.utils.R.string.cyface_notification_channel_id); final NotificationManager notificationManager = (NotificationManager)context .getSystemService(Context.NOTIFICATION_SERVICE); Validate.notNull(notificationManager); @@ -98,9 +98,9 @@ public Notification buildCapturingNotification(@NonNull final DataCapturingBackg } return new NotificationCompat.Builder(context, channelId) - .setContentTitle(context.getString(R.string.notification_title)) + .setContentTitle(context.getString(de.cyface.utils.R.string.notification_title)) .setSmallIcon(de.cyface.utils.R.drawable.ic_hourglass_empty_black_24dp) - .setContentText(context.getString(R.string.notification_text)).setOngoing(true).setAutoCancel(false) + .setContentText(context.getString(de.cyface.utils.R.string.notification_text)).setOngoing(true).setAutoCancel(false) .build(); } diff --git a/datacapturing/src/main/java/de/cyface/datacapturing/PongReceiver.java b/datacapturing/src/main/java/de/cyface/datacapturing/PongReceiver.java index 34a80fc38..aeec57dc6 100644 --- a/datacapturing/src/main/java/de/cyface/datacapturing/PongReceiver.java +++ b/datacapturing/src/main/java/de/cyface/datacapturing/PongReceiver.java @@ -179,11 +179,13 @@ public void run() { } }, currentUptimeInMillis + offset); - final Intent broadcastIntent = new Intent(pingActionId); + final Intent intent = new Intent(pingActionId); + // Binding the intent to the package of the app which runs this SDK [DAT-1509]. + intent.setPackage(context.get().getPackageName()); /*if (BuildConfig.DEBUG) { broadcastIntent.putExtra(BundlesExtrasCodes.PING_PONG_ID, pingPongIdentifier); }*/ - context.get().sendBroadcast(broadcastIntent); + context.get().sendBroadcast(intent); Log.d(TAG, "PongReceiver.checkIsRunningAsync(): Ping was sent!"); } diff --git a/datacapturing/src/main/java/de/cyface/datacapturing/backend/DataCapturingBackgroundService.java b/datacapturing/src/main/java/de/cyface/datacapturing/backend/DataCapturingBackgroundService.java index 20181affb..7d66d70cd 100644 --- a/datacapturing/src/main/java/de/cyface/datacapturing/backend/DataCapturingBackgroundService.java +++ b/datacapturing/src/main/java/de/cyface/datacapturing/backend/DataCapturingBackgroundService.java @@ -227,7 +227,11 @@ public void onCreate() { // which we cannot pass via bind() as documented by the {@link #onBind()} method. final String appId = getBaseContext().getPackageName(); pingReceiver = new PingReceiver(MessageCodes.getPingActionId(appId), MessageCodes.getPongActionId(appId)); - registerReceiver(pingReceiver, new IntentFilter(MessageCodes.getPingActionId(appId))); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + registerReceiver(pingReceiver, new IntentFilter(MessageCodes.getPingActionId(appId)), Context.RECEIVER_NOT_EXPORTED); + } else { + registerReceiver(pingReceiver, new IntentFilter(MessageCodes.getPingActionId(appId))); + } Log.d(TAG, "onCreate: Ping Receiver registered"); startupTime = System.currentTimeMillis(); @@ -363,9 +367,11 @@ public int onStartCommand(final Intent intent, final int flags, final int startI Log.d(StartUpFinishedHandler.TAG, "DataCapturingBackgroundService.onStartCommand: Sending broadcast service started."); final String appId = getBaseContext().getPackageName(); - final Intent serviceStartedIntent = new Intent(MessageCodes.getServiceStartedActionId(appId)); - serviceStartedIntent.putExtra(MEASUREMENT_ID, currentMeasurementIdentifier); - sendBroadcast(serviceStartedIntent); + final Intent startedIntent = new Intent(MessageCodes.getServiceStartedActionId(appId)); + // Binding the intent to the package of the app which runs this SDK [DAT-1509]. + startedIntent.setPackage(getBaseContext().getPackageName()); + startedIntent.putExtra(MEASUREMENT_ID, currentMeasurementIdentifier); + sendBroadcast(startedIntent); // NOT_STICKY to avoid recreation of the process which could mess up the life-cycle return Service.START_NOT_STICKY; diff --git a/datacapturing/src/main/java/de/cyface/datacapturing/backend/PingReceiver.java b/datacapturing/src/main/java/de/cyface/datacapturing/backend/PingReceiver.java index 7369c7e14..3d12c4c04 100644 --- a/datacapturing/src/main/java/de/cyface/datacapturing/backend/PingReceiver.java +++ b/datacapturing/src/main/java/de/cyface/datacapturing/backend/PingReceiver.java @@ -72,6 +72,8 @@ public void onReceive(final @NonNull Context context, final @NonNull Intent inte if (intent.getAction().equals(pingActionId)) { final Intent pongIntent = new Intent(pongActionId); + // Binding the intent to the package of the app which runs this SDK [DAT-1509]. + intent.setPackage(context.getPackageName()); /*if (BuildConfig.DEBUG) { final String pingPongIdentifier = intent.getStringExtra(BundlesExtrasCodes.PING_PONG_ID); Log.v(TAG, "PingReceiver.onReceive(): Received Ping with identifier " + pingPongIdentifier diff --git a/datacapturing/src/main/res/values/strings.xml b/datacapturing/src/main/res/values/strings.xml index 93e28c5f5..f7f270f70 100644 --- a/datacapturing/src/main/res/values/strings.xml +++ b/datacapturing/src/main/res/values/strings.xml @@ -25,5 +25,5 @@ Ticker Captured data was missing from message! - Received unknown message %d from data capturing service! + Received unknown message from data capturing service (code %d)! diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..d64cd4917 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a254..2ea3535dc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c78733..1aa94a426 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f93..7101f8e46 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/persistence/build.gradle b/persistence/build.gradle index 3f2680f03..4270bc5cf 100644 --- a/persistence/build.gradle +++ b/persistence/build.gradle @@ -30,8 +30,8 @@ plugins { } android { + namespace "de.cyface.persistence" compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion diff --git a/synchronization/build.gradle b/synchronization/build.gradle index 28d131a5d..7be9b4753 100644 --- a/synchronization/build.gradle +++ b/synchronization/build.gradle @@ -33,8 +33,8 @@ plugins { } android { + namespace "de.cyface.synchronization" compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion @@ -93,6 +93,11 @@ android { sourceCompatibility rootProject.ext.sourceCompatibility targetCompatibility rootProject.ext.targetCompatibility } + + lintOptions { + // To ignore false-positive lint errors + baseline file("lint-baseline.xml") + } } dependencies { diff --git a/synchronization/lint-baseline.xml b/synchronization/lint-baseline.xml new file mode 100644 index 000000000..9d8df51cc --- /dev/null +++ b/synchronization/lint-baseline.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + diff --git a/synchronization/src/main/java/de/cyface/synchronization/CyfaceConnectionStatusListener.java b/synchronization/src/main/java/de/cyface/synchronization/CyfaceConnectionStatusListener.java index b2b40d31b..5fa6c76be 100644 --- a/synchronization/src/main/java/de/cyface/synchronization/CyfaceConnectionStatusListener.java +++ b/synchronization/src/main/java/de/cyface/synchronization/CyfaceConnectionStatusListener.java @@ -32,12 +32,16 @@ public final class CyfaceConnectionStatusListener implements ConnectionStatusLis @Override public void onSyncStarted() { final Intent intent = new Intent(SYNC_STARTED); + // Binding the intent to the package of the app which runs this SDK [DAT-1509]. + intent.setPackage(context.getPackageName()); context.sendBroadcast(intent); } @Override public void onProgress(final float percent, final long measurementId) { final Intent intent = new Intent(SYNC_PROGRESS); + // Binding the intent to the package of the app which runs this SDK [DAT-1509]. + intent.setPackage(context.getPackageName()); intent.putExtra(SYNC_PERCENTAGE_ID, percent); intent.putExtra(SYNC_MEASUREMENT_ID, measurementId); context.sendBroadcast(intent); @@ -46,6 +50,8 @@ public void onProgress(final float percent, final long measurementId) { @Override public void onSyncFinished() { final Intent intent = new Intent(SYNC_FINISHED); + // Binding the intent to the package of the app which runs this SDK [DAT-1509]. + intent.setPackage(context.getPackageName()); context.sendBroadcast(intent); } } diff --git a/testutils/build.gradle b/testutils/build.gradle index 850fd14ba..deba68033 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -29,8 +29,8 @@ plugins { } android { + namespace "de.cyface.testutils" compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion