Merge pull request #615 from adjust/v501

uerceg · web-flow · commit c0f78d2ec77d · 2024-09-18T11:49:02.000+02:00
Version 5.0.1
diff --git a/Adjust/build.gradle b/Adjust/build.gradle
@@ -9,7 +9,7 @@ ext {
     coreMinSdkVersion = 21
     coreCompileSdkVersion = 34
     coreTargetSdkVersion = 34
-    coreVersionName = '5.0.0'
+    coreVersionName = '5.0.1'
     defaultVersionCode = 1
     webbridgeMinSdkVersion = 21
     samsungReferrerMinSdkVersion = 21
diff --git a/Adjust/examples/example-app-fbpixel/build.gradle b/Adjust/examples/example-app-fbpixel/build.gradle
@@ -35,4 +35,5 @@ dependencies {
 
     implementation project(':sdk-core')
     implementation project(':plugins:sdk-plugin-webbridge')
+    implementation 'com.adjust.signature:adjust-android-signature:3+'
 }
diff --git a/Adjust/examples/example-app-java/build.gradle b/Adjust/examples/example-app-java/build.gradle
@@ -38,4 +38,5 @@ dependencies {
     implementation 'com.google.android.gms:play-services-appset:16.0.2'
 
     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
@@ -38,4 +38,5 @@ dependencies {
     implementation 'com.google.android.gms:play-services-appset:16.0.2'
 
     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
@@ -35,4 +35,5 @@ dependencies {
     implementation 'com.google.android.gms:play-services-appset:16.0.2'
 
     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
@@ -38,4 +38,5 @@ dependencies {
     implementation 'com.google.android.gms:play-services-appset:16.0.2'
 
     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
@@ -33,4 +33,5 @@ dependencies {
 
     implementation project(':sdk-core')
     implementation project(':plugins:sdk-plugin-webbridge')
+    implementation 'com.adjust.signature:adjust-android-signature:3+'
 }
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.0.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.0.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.0.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.0.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.0.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.0.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.0.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.0.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.0.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.0.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.0.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.0.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.0.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.0.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.0.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.0.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
@@ -89,24 +89,40 @@ var Adjust = {
 
     addGlobalCallbackParameter: function(key, value) {
         if (AdjustBridge) {
+            if (typeof key !== 'string' || typeof value !== 'string') {
+                console.log('[Adjust]: Passed key or value is not of string type');
+                return;
+            }
             AdjustBridge.addGlobalCallbackParameter(key, value);
         }
     },
 
     addGlobalPartnerParameter: function(key, value) {
         if (AdjustBridge) {
+            if (typeof key !== 'string' || typeof value !== 'string') {
+                console.log('[Adjust]: Passed key or value is not of string type');
+                return;
+            }
             AdjustBridge.addGlobalPartnerParameter(key, value);
         }
     },
 
     removeGlobalCallbackParameter: function(key) {
         if (AdjustBridge) {
+            if (typeof key !== 'string') {
+                console.log('[Adjust]: Passed key is not of string type');
+                return;
+            }
             AdjustBridge.removeGlobalCallbackParameter(key);
         }
     },
 
     removeGlobalPartnerParameter: function(key) {
         if (AdjustBridge) {
+            if (typeof key !== 'string') {
+                console.log('[Adjust]: Passed key is not of string type');
+                return;
+            }
             AdjustBridge.removeGlobalPartnerParameter(key);
         }
     },
@@ -243,7 +259,7 @@ var Adjust = {
         if (this.adjustConfig) {
             return this.adjustConfig.getSdkPrefix();
         } else {
-            return 'web-bridge5.0.0';
+            return 'web-bridge5.0.1';
         }
     },
 
diff --git a/Adjust/plugins/sdk-plugin-webbridge/src/main/assets/adjust_event.js b/Adjust/plugins/sdk-plugin-webbridge/src/main/assets/adjust_event.js
@@ -14,11 +14,19 @@ AdjustEvent.prototype.setRevenue = function(revenue, currency) {
 };
 
 AdjustEvent.prototype.addCallbackParameter = function(key, value) {
+    if (typeof key !== 'string' || typeof value !== 'string') {
+        console.log('[Adjust]: Passed key or value is not of string type');
+        return;
+    }
     this.callbackParameters.push(key);
     this.callbackParameters.push(value);
 };
 
 AdjustEvent.prototype.addPartnerParameter = function(key, value) {
+    if (typeof key !== 'string' || typeof value !== 'string') {
+        console.log('[Adjust]: Passed key or value is not of string type');
+        return;
+    }
     this.partnerParameters.push(key);
     this.partnerParameters.push(value);
 };
diff --git a/Adjust/plugins/sdk-plugin-webbridge/src/main/assets/adjust_third_party_sharing.js b/Adjust/plugins/sdk-plugin-webbridge/src/main/assets/adjust_third_party_sharing.js
@@ -5,12 +5,20 @@ function AdjustThirdPartySharing(isEnabled) {
 }
 
 AdjustThirdPartySharing.prototype.addGranularOption = function(partnerName, key, value) {
+    if (typeof partnerName !== 'string' || typeof key !== 'string' || typeof value !== 'string') {
+        console.log('[Adjust]: Passed partnerName, key or value is not of string type');
+        return;
+    }
     this.granularOptions.push(partnerName);
     this.granularOptions.push(key);
     this.granularOptions.push(value);
 };
 
 AdjustThirdPartySharing.prototype.addPartnerSharingSetting = function(partnerName, key, value) {
+    if (typeof partnerName !== 'string' || typeof key !== 'string' || typeof value !== 'boolean') {
+        console.log('[Adjust]: Passed partnerName or key is not of string type or value is not of boolean type');
+        return;
+    }
     this.partnerSharingSettings.push(partnerName);
     this.partnerSharingSettings.push(key);
     this.partnerSharingSettings.push(value);
diff --git a/Adjust/plugins/sdk-plugin-webbridge/src/main/java/com/adjust/sdk/webbridge/AdjustBridgeInstance.java b/Adjust/plugins/sdk-plugin-webbridge/src/main/java/com/adjust/sdk/webbridge/AdjustBridgeInstance.java
@@ -1,10 +1,7 @@
 package com.adjust.sdk.webbridge;
 
-import android.annotation.TargetApi;
 import android.net.Uri;
 import android.os.Build;
-import android.os.Bundle;
-import android.app.Activity;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebView;
 import android.app.Application;
@@ -185,7 +182,7 @@ public void initSdk(String adjustConfigString) {
                 } else if (logLevelString.equalsIgnoreCase(LOG_LEVEL_ASSERT)) {
                     adjustConfig.setLogLevel(LogLevel.ASSERT);
                 } else if (logLevelString.equalsIgnoreCase(LOG_LEVEL_SUPPRESS)) {
-                    adjustConfig.setLogLevel(LogLevel.SUPRESS);
+                    adjustConfig.setLogLevel(LogLevel.SUPPRESS);
                 }
             }
 
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.0.0'
+    // implementation 'com.adjust.sdk:adjust-android:5.0.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+'
+                    version '[3.20.0, 4.0.0)'
                     scope 'compile'
                 }
             }
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.0.0";
+        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:5.0.1";
 
         if (defaultInstance == null) {
             defaultInstance = new AdjustInstance();
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustConfig.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustConfig.java
@@ -63,7 +63,7 @@ private void init(Context context, String appToken, String environment, boolean
         logger = AdjustFactory.getLogger();
         // default values
         if (allowSuppressLogLevel && AdjustConfig.ENVIRONMENT_PRODUCTION.equals(environment)) {
-            setLogLevel(LogLevel.SUPRESS, environment);
+            setLogLevel(LogLevel.SUPPRESS, environment);
         } else {
             setLogLevel(LogLevel.INFO, environment);
         }
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustInstance.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustInstance.java
@@ -4,6 +4,8 @@
 import android.content.Context;
 
 import com.adjust.sdk.scheduler.AsyncTaskExecutor;
+import com.adjust.sdk.scheduler.SingleThreadCachedScheduler;
+import com.adjust.sdk.scheduler.ThreadExecutor;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -780,7 +782,8 @@ private String getCachedDeeplink(final Context context) {
      * @param context Application context
      */
     private void setSendingReferrersAsNotSent(final Context context) {
-        SharedPreferencesManager.getDefaultInstance(context).setSendingReferrersAsNotSent();
+        ThreadExecutor executor = new SingleThreadCachedScheduler("AdjustInstance");
+        executor.submit(() ->  SharedPreferencesManager.getDefaultInstance(context).setSendingReferrersAsNotSent());
     }
 
     /**
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.0.0";
+    String CLIENT_SDK = "android5.0.1";
     String LOGTAG = "Adjust";
     String REFTAG = "reftag";
     String INSTALL_REFERRER = "install_referrer";
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/LogLevel.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/LogLevel.java
@@ -6,7 +6,7 @@
  * Created by pfms on 11/03/15.
  */
 public enum LogLevel {
-    VERBOSE(Log.VERBOSE), DEBUG(Log.DEBUG), INFO(Log.INFO), WARN(Log.WARN), ERROR(Log.ERROR), ASSERT(Log.ASSERT), SUPRESS(8);
+    VERBOSE(Log.VERBOSE), DEBUG(Log.DEBUG), INFO(Log.INFO), WARN(Log.WARN), ERROR(Log.ERROR), ASSERT(Log.ASSERT), SUPPRESS(8);
     final int androidLogLevel;
 
     LogLevel(final int androidLogLevel) {
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/PackageHandler.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/PackageHandler.java
@@ -193,7 +193,10 @@ public void run() {
 
         totalWaitTimeSeconds += waitTimeSeconds;
 
-        logger.verbose("Waiting for %s seconds before retrying the %d time", secondsString, retries);
+        logger.verbose("Waiting for %s seconds before retrying %s for the %d time",
+                secondsString,
+                responseData.activityPackage.getActivityKind().toString(),
+                retries);
         scheduler.schedule(runnable, waitTimeMilliSeconds);
         responseData.activityPackage.setWaitBeforeSendTimeSeconds(responseData.activityPackage.getWaitBeforeSendTimeSeconds() + waitTimeSeconds);
     }
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/network/ActivityPackageSender.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/network/ActivityPackageSender.java
@@ -417,8 +417,6 @@ private DataOutputStream configConnectionForPOST(final HttpsURLConnection connec
                 sendingParameters,
                 signedParameters);
 
-        logger.debug("Post body: %s", postBodyString);
-
         if (postBodyString == null) {
             return null;
         }
diff --git a/Adjust/tests/test-app-core/src/main/java/com/adjust/testapp/AdjustCommandExecutor.java b/Adjust/tests/test-app-core/src/main/java/com/adjust/testapp/AdjustCommandExecutor.java
@@ -31,6 +31,7 @@
 import com.adjust.sdk.OnDeferredDeeplinkResponseListener;
 import com.adjust.sdk.OnEventTrackingFailedListener;
 import com.adjust.sdk.OnEventTrackingSucceededListener;
+import com.adjust.sdk.OnLastDeeplinkReadListener;
 import com.adjust.sdk.OnPurchaseVerificationFinishedListener;
 import com.adjust.sdk.OnSessionTrackingFailedListener;
 import com.adjust.sdk.OnSessionTrackingSucceededListener;
@@ -93,6 +94,7 @@ public void executeCommand(final Command sentCommand) {
                 case "verifyTrack": verifyTrack(); break;
                 case "processDeeplink" : processDeeplink(); break;
                 case "attributionGetter" : attributionGetter(); break;
+                case "getLastDeeplink" : getLastDeeplink(); break;
                 //case "testBegin": testBegin(); break;
                 // case "testEnd": testEnd(); break;
             }
@@ -265,7 +267,7 @@ private void config() {
                     break;
                 case "assert": logLevel = LogLevel.ASSERT;
                     break;
-                case "suppress": logLevel = LogLevel.SUPRESS;
+                case "suppress": logLevel = LogLevel.SUPPRESS;
                     break;
             }
             Log.d("TestApp", logLevel.toString());
@@ -883,6 +885,17 @@ private void attributionGetter() {
         });
     }
 
+    private void getLastDeeplink() {
+        final String localBasePath = basePath;
+        Adjust.getLastDeeplink(context, new OnLastDeeplinkReadListener() {
+            @Override
+            public void onLastDeeplinkRead(Uri deeplink) {
+                MainActivity.testLibrary.addInfoToSend("last_deeplink", deeplink == null ? "" : deeplink.toString());
+                MainActivity.testLibrary.sendInfoToServer(localBasePath);
+            }
+        });
+    }
+
 /*
     private void testBegin() {
         if (command.containsParameter("teardown")) {
diff --git a/Adjust/tests/test-app-webbridge/src/main/assets/command_executor.js b/Adjust/tests/test-app-webbridge/src/main/assets/command_executor.js
@@ -566,7 +566,7 @@ AdjustCommandExecutor.prototype.thirdPartySharing = function(params) {
         for (var i = 0; i < partnerSharingSettings.length; i = i + 3) {
             var partnerName = partnerSharingSettings[i];
             var key = partnerSharingSettings[i + 1];
-            var value = partnerSharingSettings[i + 2];
+            var value = partnerSharingSettings[i + 2] == 'true';
             adjustThirdPartySharing.addPartnerSharingSetting(partnerName, key, value);
         }
     }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### Version 5.0.1 (18th September 2024)
+#### Fixed
+- Fixed ANR while reading install referrer from Shared Preferences during SDK initialization.
+- Fixed typo in `SUPPRESS` log level constant and renamed it from `SUPRESS to SUPPRESS` (https://github.com/adjust/android_sdk/issues/613).
+
+#### Changed
+- Added validation when passing callback / partner parameters and third party sharing granular options / partner sharing setting parameters in web bridge.
+- Updated some log messages to add more clarity.
+
+---
+
 ### Version 5.0.0 (2nd August 2024)
 
 We're excited to release our major new SDK version (v5). Among many internal improvements, our spoofing protection solution is now included out of the box, reinforcing our commitment to accurate, actionable, and fraud-free data.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.0.0
+5.0.1

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,5 @@ dependencies {`
`35`	`35`
`36`	`36`	`implementation project(':sdk-core')`
`37`	`37`	`implementation project(':plugins:sdk-plugin-webbridge')`
	`38`	`+ implementation 'com.adjust.signature:adjust-android-signature:3+'`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,5 @@ dependencies {`
`38`	`38`	`implementation 'com.google.android.gms:play-services-appset:16.0.2'`
`39`	`39`
`40`	`40`	`implementation project(':sdk-core')`
	`41`	`+ implementation 'com.adjust.signature:adjust-android-signature:3+'`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,5 @@ dependencies {`
`33`	`33`
`34`	`34`	`implementation project(':sdk-core')`
`35`	`35`	`implementation project(':plugins:sdk-plugin-webbridge')`
	`36`	`+ implementation 'com.adjust.signature:adjust-android-signature:3+'`
`36`	`37`	`}`
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.0.0'`
	`30`	`+ // implementation 'com.adjust.sdk:adjust-android:5.0.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.0.0'`
	`33`	`+ // implementation 'com.adjust.sdk:adjust-android:5.0.1'`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`// read local properties`