Merge pull request #580 from adjust/v4350

shashanksu · web-flow · commit edfe32775dcf · 2023-09-12T12:40:18.000+02:00
Version 4.35.0
diff --git a/Adjust/build.gradle b/Adjust/build.gradle
@@ -9,7 +9,7 @@ ext {
     coreMinSdkVersion = 9
     coreCompileSdkVersion = 33
     coreTargetSdkVersion = 33
-    coreVersionName = '4.34.0'
+    coreVersionName = '4.35.0'
     defaultVersionCode = 1
     webbridgeMinSdkVersion = 17
     samsungReferrerMinSdkVersion = 18
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
@@ -457,6 +457,11 @@ public boolean updateAttributionI(AdjustAttribution attribution) {
             return false;
         }
 
+        if (adjustConfig.finalAttributionEnabled && activityState.askingAttribution) {
+            logger.info("Not updating intermediate attribution");
+            return false;
+        }
+
         if (attribution.equals(this.attribution)) {
             return false;
         }
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityPackage.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityPackage.java
@@ -200,7 +200,7 @@ public String getExtendedString() {
         if (parameters != null) {
             builder.append("Parameters:");
             SortedMap<String,String> sortedParameters = new TreeMap<String,String>(parameters);
-            List<String> stringsToExclude = Arrays.asList("app_secret", "secret_id", "event_callback_id");
+            List<String> stringsToExclude = Arrays.asList("app_secret", "secret_id", "event_callback_id", "adj_signing_id");
             for (Map.Entry<String,String> entry : sortedParameters.entrySet() ) {
                 String key = entry.getKey();
                 if (stringsToExclude.contains(key)) {
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
@@ -34,7 +34,7 @@ private Adjust() {
      */
     public static synchronized AdjustInstance getDefaultInstance() {
         @SuppressWarnings("unused")
-        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.34.0";
+        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.35.0";
 
         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
@@ -44,6 +44,7 @@ public class AdjustConfig {
     String preinstallFilePath;
     boolean playStoreKidsAppEnabled;
     boolean coppaCompliantEnabled;
+    boolean finalAttributionEnabled;
 
     public static final String ENVIRONMENT_SANDBOX = "sandbox";
     public static final String ENVIRONMENT_PRODUCTION = "production";
@@ -197,6 +198,10 @@ public void setCoppaCompliantEnabled(boolean coppaCompliantEnabled) {
         this.coppaCompliantEnabled = coppaCompliantEnabled;
     }
 
+    public void setFinalAttributionEnabled(boolean finalAttributionEnabled) {
+        this.finalAttributionEnabled = finalAttributionEnabled;
+    }
+
     public boolean isValid() {
         if (!checkAppToken(appToken)) return false;
         if (!checkEnvironment(environment)) return false;
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
@@ -30,7 +30,7 @@ public interface Constants {
 
     String SCHEME = "https";
     String AUTHORITY = "app.adjust.com";
-    String CLIENT_SDK = "android4.34.0";
+    String CLIENT_SDK = "android4.35.0";
     String LOGTAG = "Adjust";
     String REFTAG = "reftag";
     String INSTALL_REFERRER = "install_referrer";
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
@@ -529,18 +529,25 @@ private String buildAndExtractAuthorizationHeader(final Map<String, String> para
                                                       final ActivityKind activityKind) {
         String activityKindString = activityKind.toString();
 
+        String adjSigningId = extractAdjSigningId(parameters);
         String secretId = extractSecretId(parameters);
         String headersId = extractHeadersId(parameters);
         String signature = extractSignature(parameters);
         String algorithm = extractAlgorithm(parameters);
         String nativeVersion = extractNativeVersion(parameters);
 
-        String authorizationHeader = buildAuthorizationHeaderV2(signature, secretId,
+        String authorizationHeader = buildAuthorizationHeaderV2WithAdjSigningId(signature, adjSigningId,
                 headersId, algorithm, nativeVersion);
         if (authorizationHeader != null) {
             return authorizationHeader;
         }
 
+        authorizationHeader = buildAuthorizationHeaderV2WithSecretId(signature, secretId, headersId,
+                algorithm, nativeVersion);
+        if (authorizationHeader != null) {
+            return authorizationHeader;
+        }
+
         String appSecret = extractAppSecret(parameters);
         return buildAuthorizationHeaderV1(parameters, appSecret, secretId, activityKindString);
     }
@@ -574,11 +581,35 @@ private String buildAuthorizationHeaderV1(final Map<String, String> parameters,
         return authorizationHeader;
     }
 
-    private String buildAuthorizationHeaderV2(final String signature,
-                                              final String secretId,
-                                              final String headersId,
-                                              final String algorithm,
-                                              final String nativeVersion)
+    private String buildAuthorizationHeaderV2WithAdjSigningId(final String signature,
+                                                              final String adjSigningId,
+                                                              final String headersId,
+                                                              final String algorithm,
+                                                              final String nativeVersion)
+    {
+        if (adjSigningId == null || signature == null || headersId == null) {
+            return null;
+        }
+
+        String signatureHeader = Util.formatString("signature=\"%s\"", signature);
+        String adjSigningIdHeader  = Util.formatString("adj_signing_id=\"%s\"", adjSigningId);
+        String idHeader        = Util.formatString("headers_id=\"%s\"", headersId);
+        String algorithmHeader = Util.formatString("algorithm=\"%s\"", algorithm != null ? algorithm : "adj1");
+        String nativeVersionHeader = Util.formatString("native_version=\"%s\"", nativeVersion != null ? nativeVersion : "");
+
+        String authorizationHeader = Util.formatString("Signature %s,%s,%s,%s,%s",
+                signatureHeader, adjSigningIdHeader, algorithmHeader, idHeader, nativeVersionHeader);
+
+        logger.verbose("authorizationHeader: %s", authorizationHeader);
+
+        return authorizationHeader;
+    }
+
+    private String buildAuthorizationHeaderV2WithSecretId(final String signature,
+                                                          final String secretId,
+                                                          final String headersId,
+                                                          final String algorithm,
+                                                          final String nativeVersion)
     {
         if (secretId == null || signature == null || headersId == null) {
             return null;
@@ -702,4 +733,10 @@ private static String extractHeadersId(final Map<String, String> parameters) {
     private static void extractEventCallbackId(final Map<String, String> parameters) {
         parameters.remove("event_callback_id");
     }
+
+    private static String extractAdjSigningId(final Map<String, String> parameters) {
+        return parameters.remove("adj_signing_id");
+    }
+
+
 }
diff --git a/Adjust/sdk-plugin-criteo/build.gradle b/Adjust/sdk-plugin-criteo/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.34.0'
+    // implementation 'com.adjust.sdk:adjust-android:4.35.0'
 }
 
 // read local properties
diff --git a/Adjust/sdk-plugin-imei/build.gradle b/Adjust/sdk-plugin-imei/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.34.0'
+    // implementation 'com.adjust.sdk:adjust-android:4.35.0'
 }
 
 // read local properties
diff --git a/Adjust/sdk-plugin-oaid/build.gradle b/Adjust/sdk-plugin-oaid/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.34.0'
+    // implementation 'com.adjust.sdk:adjust-android:4.35.0'
     implementation 'com.huawei.hms:ads-identifier:3.4.56.300'
 }
 
diff --git a/Adjust/sdk-plugin-samsung-referrer/build.gradle b/Adjust/sdk-plugin-samsung-referrer/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.34.0'
+    // implementation 'com.adjust.sdk:adjust-android:4.35.0'
 
     // Add Samsung referrer lib via Maven.
     implementation 'store.galaxy.samsung.installreferrer:samsung_galaxystore_install_referrer:3.0.1'
diff --git a/Adjust/sdk-plugin-sociomantic/build.gradle b/Adjust/sdk-plugin-sociomantic/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.34.0'
+    // implementation 'com.adjust.sdk:adjust-android:4.35.0'
 }
 
 // read local properties
diff --git a/Adjust/sdk-plugin-trademob/build.gradle b/Adjust/sdk-plugin-trademob/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.34.0'
+    // implementation 'com.adjust.sdk:adjust-android:4.35.0'
 }
 
 // read local properties
diff --git a/Adjust/sdk-plugin-vivo-referrer/build.gradle b/Adjust/sdk-plugin-vivo-referrer/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.34.0'
+    // implementation 'com.adjust.sdk:adjust-android:4.35.0'
 }
 
 // read local properties
diff --git a/Adjust/sdk-plugin-webbridge/build.gradle b/Adjust/sdk-plugin-webbridge/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.34.0'
+    // implementation 'com.adjust.sdk:adjust-android:4.35.0'
 }
 
 // read local properties
diff --git a/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js b/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js
@@ -211,7 +211,7 @@ var Adjust = {
         if (this.adjustConfig) {
             return this.adjustConfig.getSdkPrefix();
         } else {
-            return 'web-bridge4.34.0';
+            return 'web-bridge4.35.0';
         }
     },
 
diff --git a/Adjust/sdk-plugin-webbridge/src/main/assets/adjust_config.js b/Adjust/sdk-plugin-webbridge/src/main/assets/adjust_config.js
@@ -55,6 +55,7 @@ function AdjustConfig(appToken, environment, legacy) {
     this.preinstallFilePath = null;
     this.playStoreKidsAppEnabled = null;
     this.coppaCompliantEnabled = null;
+    this.finalAttributionEnabled = null;
 }
 
 AdjustConfig.EnvironmentSandbox = 'sandbox';
@@ -259,3 +260,7 @@ AdjustConfig.prototype.setPlayStoreKidsAppEnabled = function(isEnabled) {
 AdjustConfig.prototype.setCoppaCompliantEnabled = function(isEnabled) {
     this.coppaCompliantEnabled = isEnabled;
 };
+
+AdjustConfig.prototype.setFinalAttributionEnabled = function(isEnabled) {
+    this.finalAttributionEnabled = isEnabled;
+};
diff --git a/Adjust/sdk-plugin-webbridge/src/main/java/com/adjust/sdk/webbridge/AdjustBridgeInstance.java b/Adjust/sdk-plugin-webbridge/src/main/java/com/adjust/sdk/webbridge/AdjustBridgeInstance.java
@@ -174,6 +174,7 @@ public void onCreate(String adjustConfigString) {
             Object preinstallFilePathField = jsonAdjustConfig.get("preinstallFilePath");
             Object playStoreKidsAppEnabledField = jsonAdjustConfig.get("playStoreKidsAppEnabled");
             Object coppaCompliantEnabledField = jsonAdjustConfig.get("coppaCompliantEnabled");
+            Object finalAttributionEnabledField = jsonAdjustConfig.get("finalAttributionEnabled");
 
             String appToken = AdjustBridgeUtil.fieldToString(appTokenField);
             String environment = AdjustBridgeUtil.fieldToString(environmentField);
@@ -401,6 +402,12 @@ public boolean launchReceivedDeeplink(Uri deeplink) {
                 adjustConfig.setCoppaCompliantEnabled(coppaCompliantEnabled);
             }
 
+            // Final attribution config
+            Boolean finalAttributionEnabled = AdjustBridgeUtil.fieldToBoolean(finalAttributionEnabledField);
+            if (finalAttributionEnabled != null) {
+                adjustConfig.setFinalAttributionEnabled(finalAttributionEnabled);
+            }
+
             // Manually call onResume() because web view initialisation will happen a bit delayed.
             // With this delay, it will miss lifecycle callback onResume() initial firing.
             Adjust.onCreate(adjustConfig);
diff --git a/Adjust/sdk-plugin-xiaomi-referrer/build.gradle b/Adjust/sdk-plugin-xiaomi-referrer/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.34.0'
+    // implementation 'com.adjust.sdk:adjust-android:4.35.0'
 
     // Add xiaomi referrer lib via Maven.
     implementation 'com.miui.referrer:homereferrer:1.0.0.6'
diff --git a/Adjust/test-app-core/src/main/java/com/adjust/testapp/AdjustCommandExecutor.java b/Adjust/test-app-core/src/main/java/com/adjust/testapp/AdjustCommandExecutor.java
@@ -341,6 +341,12 @@ private void config() {
             adjustConfig.setPlayStoreKidsAppEnabled(playStoreKids);
         }
 
+        if (command.containsParameter("finalAttributionEnabled")) {
+            String finalAttributionEnabledS = command.getFirstParameterValue("finalAttributionEnabled");
+            boolean finalAttributionEnabled = "true".equals(finalAttributionEnabledS);
+            adjustConfig.setFinalAttributionEnabled(finalAttributionEnabled);
+        }
+
         if(command.containsParameter("deferredDeeplinkCallback")) {
             adjustConfig.setOnDeeplinkResponseListener(new OnDeeplinkResponseListener() {
                 @Override
diff --git a/Adjust/test-app-webbridge/src/main/assets/command_executor.js b/Adjust/test-app-webbridge/src/main/assets/command_executor.js
@@ -352,6 +352,12 @@ AdjustCommandExecutor.prototype.config = function(params) {
         adjustConfig.setPlayStoreKidsAppEnabled(playStoreKids);
     }
 
+    if ('finalAttributionEnabled' in params) {
+        var finalAttributionEnabledS = getFirstParameterValue(params, 'finalAttributionEnabled');
+        var finalAttributionEnabled = finalAttributionEnabledS == 'true';
+        adjustConfig.setFinalAttributionEnabled(finalAttributionEnabled);
+    }
+
     if ('attributionCallbackSendAll' in params) {
         var basePath = this.basePath;
         adjustConfig.setAttributionCallback(function(attribution) {
diff --git a/Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java b/Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java
@@ -53,7 +53,7 @@ public TestActivityPackage(ActivityPackage activityPackage) {
         // default values
         appToken = "123456789012";
         environment = "sandbox";
-        clientSdk = "android4.34.0";
+        clientSdk = "android4.35.0";
         suffix = "";
         attribution = new AdjustAttribution();
         playServices = true;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### Version 4.35.0 (12th September 2023)
+#### Added
+- Added support for SigV3 library. Update authorization header building logic to use `adj_signing_id`.
+- Added `setFinalAttributionEnabled(boolean)` method to `AdjustConfig` to indicate if only final attribution is needed in attribution callback (by default attribution callback return intermediate attribution as well before final attribution if not enabled with this setter method).
+
+---
+
 ### Version 4.34.0 (17th August 2023)
 #### Added
 - Added support for purchase verification. In case you are using this feature, you can now use it by calling `verifyPurchase` method of the `Adjust` instance.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.34.0
+4.35.0

Original file line number	Diff line number	Diff line change
`@@ -457,6 +457,11 @@ public boolean updateAttributionI(AdjustAttribution attribution) {`
`457`	`457`	`return false;`
`458`	`458`	`}`
`459`	`459`
	`460`	`+ if (adjustConfig.finalAttributionEnabled && activityState.askingAttribution) {`
	`461`	`+ logger.info("Not updating intermediate attribution");`
	`462`	`+ return false;`
	`463`	`+ }`
	`464`	`+`
`460`	`465`	`if (attribution.equals(this.attribution)) {`
`461`	`466`	`return false;`
`462`	`467`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ dependencies {`
`23`	`23`	`// Add SDK via module.`
`24`	`24`	`compileOnly project(':sdk-core')`
`25`	`25`	`// Add SDK via Maven.`
`26`		`- // implementation 'com.adjust.sdk:adjust-android:4.34.0'`
	`26`	`+ // implementation 'com.adjust.sdk:adjust-android:4.35.0'`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// read local properties`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ dependencies {`
`22`	`22`	`// Add SDK via module.`
`23`	`23`	`compileOnly project(':sdk-core')`
`24`	`24`	`// Add SDK via Maven.`
`25`		`- // implementation 'com.adjust.sdk:adjust-android:4.34.0'`
	`25`	`+ // implementation 'com.adjust.sdk:adjust-android:4.35.0'`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// read local properties`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ dependencies {`
`25`	`25`	`// Add SDK via module.`
`26`	`26`	`compileOnly project(':sdk-core')`
`27`	`27`	`// Add SDK via Maven.`
`28`		`- // implementation 'com.adjust.sdk:adjust-android:4.34.0'`
	`28`	`+ // implementation 'com.adjust.sdk:adjust-android:4.35.0'`
`29`	`29`	`implementation 'com.huawei.hms:ads-identifier:3.4.56.300'`
`30`	`30`	`}`
`31`	`31`