Merge pull request #642 from adjust/v541

shashanksu · web-flow · commit 818a1d0916cc · 2025-06-23T14:32:26.000+02:00
Version 5.4.1
diff --git a/Adjust/build.gradle b/Adjust/build.gradle
@@ -7,9 +7,9 @@ subprojects {
 ext {
     // Android config.
     coreMinSdkVersion = 21
-    coreCompileSdkVersion = 35
-    coreTargetSdkVersion = 35
-    coreVersionName = '5.4.0'
+    coreCompileSdkVersion = 36
+    coreTargetSdkVersion = 36
+    coreVersionName = '5.4.1'
     defaultVersionCode = 1
     webbridgeMinSdkVersion = 21
     samsungReferrerMinSdkVersion = 21
@@ -28,7 +28,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.8.0'
+        classpath 'com.android.tools.build:gradle:8.10.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files.
diff --git a/Adjust/examples/example-app-fbpixel/build.gradle b/Adjust/examples/example-app-fbpixel/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         applicationId "com.adjust.examples"
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
     }
@@ -29,9 +29,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
-    implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'
+    implementation 'com.google.android.gms:play-services-ads-identifier:18.2.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
-    implementation 'com.google.android.gms:play-services-appset:16.0.2'
+    implementation 'com.google.android.gms:play-services-appset:16.1.0'
 
     implementation project(':sdk-core')
     implementation project(':plugins:sdk-plugin-webbridge')
diff --git a/Adjust/examples/example-app-java/build.gradle b/Adjust/examples/example-app-java/build.gradle
@@ -7,12 +7,12 @@ repositories {
 }
 
 android {
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         applicationId "com.adjust.examples"
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
     }
@@ -33,9 +33,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
-    implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'
+    implementation 'com.google.android.gms:play-services-ads-identifier:18.2.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
-    implementation 'com.google.android.gms:play-services-appset:16.0.2'
+    implementation 'com.google.android.gms:play-services-appset:16.1.0'
 
     implementation project(':sdk-core')
     implementation 'com.adjust.signature:adjust-android-signature:3+'
diff --git a/Adjust/examples/example-app-keyboard/build.gradle b/Adjust/examples/example-app-keyboard/build.gradle
@@ -7,12 +7,12 @@ repositories {
 }
 
 android {
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         applicationId "com.adjust.examples.keyboard"
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
     }
@@ -33,9 +33,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
-    implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'
+    implementation 'com.google.android.gms:play-services-ads-identifier:18.2.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
-    implementation 'com.google.android.gms:play-services-appset:16.0.2'
+    implementation 'com.google.android.gms:play-services-appset:16.1.0'
 
     implementation project(':sdk-core')
     implementation 'com.adjust.signature:adjust-android-signature:3+'
diff --git a/Adjust/examples/example-app-kotlin/build.gradle b/Adjust/examples/example-app-kotlin/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 android {
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         applicationId "com.adjust.examples"
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
 
@@ -35,9 +35,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
-    implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'
+    implementation 'com.google.android.gms:play-services-ads-identifier:18.2.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
-    implementation 'com.google.android.gms:play-services-appset:16.0.2'
+    implementation 'com.google.android.gms:play-services-appset:16.1.0'
 
     implementation project(':sdk-core')
     implementation 'com.adjust.signature:adjust-android-signature:3+'
diff --git a/Adjust/examples/example-app-tv/build.gradle b/Adjust/examples/example-app-tv/build.gradle
@@ -7,12 +7,12 @@ repositories {
 }
 
 android {
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         applicationId "com.adjust.examples"
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
     }
@@ -33,9 +33,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
-    implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'
+    implementation 'com.google.android.gms:play-services-ads-identifier:18.2.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
-    implementation 'com.google.android.gms:play-services-appset:16.0.2'
+    implementation 'com.google.android.gms:play-services-appset:16.1.0'
 
     implementation project(':sdk-core')
     implementation 'com.adjust.signature:adjust-android-signature:3+'
diff --git a/Adjust/examples/example-app-webbridge/build.gradle b/Adjust/examples/example-app-webbridge/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         applicationId "com.example.examples"
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
     }
@@ -27,9 +27,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
-    implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'
+    implementation 'com.google.android.gms:play-services-ads-identifier:18.2.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
-    implementation 'com.google.android.gms:play-services-appset:16.0.2'
+    implementation 'com.google.android.gms:play-services-appset:16.1.0'
 
     implementation project(':sdk-core')
     implementation project(':plugins:sdk-plugin-webbridge')
diff --git a/Adjust/gradle/wrapper/gradle-wrapper.properties b/Adjust/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Oct 06 12:16:52 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Adjust/plugins/sdk-plugin-huawei-referrer/build.gradle b/Adjust/plugins/sdk-plugin-huawei-referrer/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.4.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.4.1'
 }
 
 // read local properties
diff --git a/Adjust/plugins/sdk-plugin-imei/build.gradle b/Adjust/plugins/sdk-plugin-imei/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.4.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.4.1'
 }
 
 // read local properties
diff --git a/Adjust/plugins/sdk-plugin-meta-referrer/build.gradle b/Adjust/plugins/sdk-plugin-meta-referrer/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.4.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.4.1'
 }
 
 // read local properties
diff --git a/Adjust/plugins/sdk-plugin-oaid/build.gradle b/Adjust/plugins/sdk-plugin-oaid/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.4.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.4.1'
     implementation 'com.huawei.hms:ads-identifier:3.4.56.300'
 }
 
diff --git a/Adjust/plugins/sdk-plugin-samsung-clouddev/build.gradle b/Adjust/plugins/sdk-plugin-samsung-clouddev/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.4.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.4.1'
 
     // Add Samsung clouddev lib.
     compileOnly fileTree(include: ['*.aar'], dir: 'libs')
diff --git a/Adjust/plugins/sdk-plugin-samsung-referrer/build.gradle b/Adjust/plugins/sdk-plugin-samsung-referrer/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.4.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.4.1'
 
     // Add Samsung referrer lib via Maven.
     implementation 'store.galaxy.samsung.installreferrer:samsung_galaxystore_install_referrer:3.0.1'
diff --git a/Adjust/plugins/sdk-plugin-vivo-referrer/build.gradle b/Adjust/plugins/sdk-plugin-vivo-referrer/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.4.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.4.1'
 }
 
 // read local properties
diff --git a/Adjust/plugins/sdk-plugin-webbridge/build.gradle b/Adjust/plugins/sdk-plugin-webbridge/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.4.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.4.1'
 }
 
 // read local properties
diff --git a/Adjust/plugins/sdk-plugin-webbridge/src/main/assets/adjust.js b/Adjust/plugins/sdk-plugin-webbridge/src/main/assets/adjust.js
@@ -295,7 +295,7 @@ var Adjust = {
         if (this.adjustConfig) {
             return this.adjustConfig.getSdkPrefix();
         } else {
-            return 'web-bridge5.4.0';
+            return 'web-bridge5.4.1';
         }
     },
 
diff --git a/Adjust/plugins/sdk-plugin-xiaomi-referrer/build.gradle b/Adjust/plugins/sdk-plugin-xiaomi-referrer/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:5.4.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.4.1'
 
     // Add xiaomi referrer lib via Maven.
     implementation 'com.miui.referrer:homereferrer:1.0.0.6'
diff --git a/Adjust/sdk-core/build.gradle b/Adjust/sdk-core/build.gradle
@@ -220,7 +220,7 @@ def customizePomForAar(pom) {
                 dependency {
                     groupId 'com.adjust.signature'
                     artifactId 'adjust-android-signature'
-                    version '3.35.2'
+                    version '3.47.0'
                     scope 'compile'
                 }
             }
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java
@@ -2073,6 +2073,22 @@ private void processDeeplinkI(AdjustDeeplink deeplink, long clickTime) {
             return;
         }
 
+        if (Util.isUrlWithTrackerQueryParam(deeplink.getUrl())) {
+            final String resolvedLink = deeplink.getUrl().toString();
+            Handler handler = new Handler(adjustConfig.context.getMainLooper());
+            OnDeeplinkResolvedListener onDeeplinkResolvedListener = cachedDeeplinkResolutionCallback;
+            cachedDeeplinkResolutionCallback = null;
+            if (onDeeplinkResolvedListener != null) {
+                Runnable runnable = new Runnable() {
+                    @Override
+                    public void run() {
+                        onDeeplinkResolvedListener.onDeeplinkResolved(resolvedLink);
+                    }
+                };
+                handler.post(runnable);
+            }
+        }
+
         ActivityPackage sdkClickPackage = PackageFactory.buildDeeplinkSdkClickPackage(
                 deeplink.getUrl(),
                 deeplink.getReferrer(),
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java
@@ -32,7 +32,7 @@ private Adjust() {
      */
     public static synchronized AdjustInstance getDefaultInstance() {
         @SuppressWarnings("unused")
-        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:5.4.0";
+        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:5.4.1";
 
         if (defaultInstance == null) {
             defaultInstance = new AdjustInstance();
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustSigner.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustSigner.java
@@ -52,7 +52,7 @@ public static Map<String, String> sign(final Map<String, String> packageParams,
                         context, packageParams, extraParams, outputParams);
 
             } catch (Exception e) {
-                logger.warn("Invoking Signer sign() for %s received an error [%s]", e.getMessage());
+                logger.warn("Invoking Signer sign() received an error [%s]", e.getMessage());
             }
         }
 
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java
@@ -37,7 +37,7 @@ public interface Constants {
 
     String SCHEME = "https";
     String AUTHORITY = "app.adjust.com";
-    String CLIENT_SDK = "android5.4.0";
+    String CLIENT_SDK = "android5.4.1";
     String LOGTAG = "Adjust";
     String REFTAG = "reftag";
     String INSTALL_REFERRER = "install_referrer";
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/StoreInfoUtil.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/StoreInfoUtil.java
@@ -8,6 +8,7 @@
 import android.os.Bundle;
 
 public class StoreInfoUtil {
+    @SuppressWarnings("deprecation")
     public static String getStoreIdFromSystem(final Context context) {
         try {
             PackageManager packageManager = context.getPackageManager();
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Util.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Util.java
@@ -623,6 +623,23 @@ public static boolean isUrlFilteredOut(Uri url) {
         return false;
     }
 
+    public static boolean isUrlWithTrackerQueryParam(Uri url) {
+        try {
+            String trackerParam = url.getQueryParameter("adj_t");
+            if (trackerParam != null) {
+                return true;
+            }
+
+            trackerParam = url.getQueryParameter("adjust_t");
+            if (trackerParam != null) {
+                return true;
+            }
+        } catch (Exception e) {
+        }
+
+        return false;
+    }
+
     public static String getSdkVersion() {
         return Constants.CLIENT_SDK;
     }
diff --git a/Adjust/tests/test-app-core/build.gradle b/Adjust/tests/test-app-core/build.gradle
@@ -7,12 +7,12 @@ repositories {
 }
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     defaultConfig {
         applicationId "com.adjust.testapp"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
     }
@@ -28,7 +28,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
-    implementation 'com.google.android.gms:play-services-ads-identifier:17.1.0'
+    implementation 'com.google.android.gms:play-services-ads-identifier:18.2.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
     implementation 'com.adjust.signature:adjust-android-signature:3+'
 
diff --git a/Adjust/tests/test-app-webbridge/build.gradle b/Adjust/tests/test-app-webbridge/build.gradle
diff --git a/Adjust/tests/test-library/build.gradle b/Adjust/tests/test-library/build.gradle
diff --git a/Adjust/tests/test-options/build.gradle b/Adjust/tests/test-options/build.gradle
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/VERSION b/VERSION

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ dependencies {`
`27`	`27`	`// Add SDK via module.`
`28`	`28`	`compileOnly project(':sdk-core')`
`29`	`29`	`// Add SDK via Maven.`
`30`		`- // implementation 'com.adjust.sdk:adjust-android:5.4.0'`
	`30`	`+ // implementation 'com.adjust.sdk:adjust-android:5.4.1'`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// read local properties`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ dependencies {`
`30`	`30`	`// Add SDK via module.`
`31`	`31`	`compileOnly project(':sdk-core')`
`32`	`32`	`// Add SDK via Maven.`
`33`		`- // implementation 'com.adjust.sdk:adjust-android:5.4.0'`
	`33`	`+ // implementation 'com.adjust.sdk:adjust-android:5.4.1'`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`// read local properties`