Merge pull request #499 from adjust/v4283

Version 4.28.3

Author: uerceg

Adjust/build.gradle

@@ -9,7 +9,7 @@ ext {
     coreMinSdkVersion = 9
     coreCompileSdkVersion = 30
     coreTargetSdkVersion = 30
-    coreVersionName = '4.28.2'
+    coreVersionName = '4.28.3'
     defaultVersionCode = 1
     webbridgeMinSdkVersion = 17
 

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:4.28.2";
+        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.28.3";
 
         if (defaultInstance == null) {
             defaultInstance = new AdjustInstance();

Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java

@@ -29,7 +29,7 @@ public interface Constants {
 
     String SCHEME = "https";
     String AUTHORITY = "app.adjust.com";
-    String CLIENT_SDK = "android4.28.2";
+    String CLIENT_SDK = "android4.28.3";
     String LOGTAG = "Adjust";
     String REFTAG = "reftag";
     String INSTALL_REFERRER = "install_referrer";

Adjust/sdk-core/src/main/java/com/adjust/sdk/network/ActivityPackageSender.java

@@ -128,17 +128,27 @@ private void tryToGetResponse(final ResponseData responseData) {
 
         try {
             ActivityPackage activityPackage = responseData.activityPackage;
+            Map<String, String> activityPackageParameters =
+                    new HashMap<>(activityPackage.getParameters());
             Map<String, String> sendingParameters = responseData.sendingParameters;
 
+            String authorizationHeader = buildAndExtractAuthorizationHeader(
+                    activityPackageParameters,
+                    activityPackage.getActivityKind());
+
             boolean shouldUseGET =
                     responseData.activityPackage.getActivityKind() == ActivityKind.ATTRIBUTION;
             final String urlString;
             if (shouldUseGET) {
-                extractEventCallbackId(activityPackage.getParameters());
+                extractEventCallbackId(activityPackageParameters);
 
-                urlString = generateUrlStringForGET(activityPackage, sendingParameters);
+                urlString = generateUrlStringForGET(activityPackage.getActivityKind(),
+                                                    activityPackage.getPath(),
+                                                    activityPackageParameters,
+                                                    sendingParameters);
             } else {
-                urlString = generateUrlStringForPOST(activityPackage);
+                urlString = generateUrlStringForPOST(activityPackage.getActivityKind(),
+                                                     activityPackage.getPath());
             }
 
             final URL url = new URL(urlString);
@@ -148,18 +158,18 @@ private void tryToGetResponse(final ResponseData responseData) {
             // get and apply connection options (default or for tests)
             connectionOptions.applyConnectionOptions(connection, activityPackage.getClientSdk());
 
-            String authorizationHeader = buildAuthorizationHeader(activityPackage);
             if (authorizationHeader != null) {
                 connection.setRequestProperty("Authorization", authorizationHeader);
             }
 
             if (shouldUseGET) {
                 dataOutputStream = configConnectionForGET(connection);
             } else {
-                extractEventCallbackId(activityPackage.getParameters());
+                extractEventCallbackId(activityPackageParameters);
 
-                dataOutputStream =
-                        configConnectionForPOST(connection, activityPackage, sendingParameters);
+                dataOutputStream = configConnectionForPOST(connection,
+                                                           activityPackageParameters,
+                                                           sendingParameters);
             }
 
             // read connection response
@@ -249,26 +259,28 @@ private String errorMessage(final Throwable throwable,
         return Util.formatString("%s. (%s)", failureMessage, reasonString);
     }
 
-    private String generateUrlStringForGET(final ActivityPackage activityPackage,
+    private String generateUrlStringForGET(final ActivityKind activityKind,
+                                           final String activityPackagePath,
+                                           final Map<String, String> activityPackageParameters,
                                            final Map<String, String> sendingParameters)
             throws MalformedURLException
     {
-        String targetUrl = urlStrategy.targetUrlByActivityKind(activityPackage.getActivityKind());
+        String targetUrl = urlStrategy.targetUrlByActivityKind(activityKind);
 
         // extra path, if present, has the format '/X/Y'
         String urlWithPath =
-                urlWithExtraPathByActivityKind(activityPackage.getActivityKind(), targetUrl);
+                urlWithExtraPathByActivityKind(activityKind, targetUrl);
 
         final URL urlObject = new URL(urlWithPath);
         final Uri.Builder uriBuilder = new Uri.Builder();
         uriBuilder.scheme(urlObject.getProtocol());
         uriBuilder.encodedAuthority(urlObject.getAuthority());
         uriBuilder.path(urlObject.getPath());
-        uriBuilder.appendPath(activityPackage.getPath());
+        uriBuilder.appendPath(activityPackagePath);
 
         logger.debug("Making request to url: %s", uriBuilder.toString());
 
-        for (final Map.Entry<String, String> entry : activityPackage.getParameters().entrySet()) {
+        for (final Map.Entry<String, String> entry : activityPackageParameters.entrySet()) {
             uriBuilder.appendQueryParameter(entry.getKey(), entry.getValue());
         }
 
@@ -281,19 +293,20 @@ private String generateUrlStringForGET(final ActivityPackage activityPackage,
         return uriBuilder.build().toString();
     }
 
-    private String generateUrlStringForPOST(final ActivityPackage activityPackage)
+    private String generateUrlStringForPOST(final ActivityKind activityKind,
+                                            final String activityPackagePath)
     {
         String targetUrl =
-                urlStrategy.targetUrlByActivityKind(activityPackage.getActivityKind());
+                urlStrategy.targetUrlByActivityKind(activityKind);
 
         // extra path, if present, has the format '/X/Y'
         String urlWithPath =
-                urlWithExtraPathByActivityKind(activityPackage.getActivityKind(), targetUrl);
+                urlWithExtraPathByActivityKind(activityKind, targetUrl);
 
 
         // 'targetUrl' does not end with '/', but activity package paths that are sent by POST
         //  do start with '/', so it's not added om between
-        String urlString = Util.formatString("%s%s", urlWithPath, activityPackage.getPath());
+        String urlString = Util.formatString("%s%s", urlWithPath, activityPackagePath);
 
         logger.debug("Making request to url : %s", urlString);
 
@@ -322,7 +335,7 @@ private DataOutputStream configConnectionForGET(final HttpsURLConnection connect
     }
 
     private DataOutputStream configConnectionForPOST(final HttpsURLConnection connection,
-                                                     final ActivityPackage activityPackage,
+                                                     final Map<String, String> activityPackageParameters,
                                                      final Map<String, String> sendingParameters)
             throws ProtocolException,
             UnsupportedEncodingException,
@@ -339,7 +352,7 @@ private DataOutputStream configConnectionForPOST(final HttpsURLConnection connec
 
         // build POST body
         final String postBodyString = generatePOSTBodyString(
-                activityPackage.getParameters(),
+                activityPackageParameters,
                 sendingParameters);
 
         if (postBodyString == null) {
@@ -510,9 +523,9 @@ private void parseResponse(final ResponseData responseData, final String respons
                 Util.getSdkPrefixPlatform(clientSdk));
     }
 
-    private String buildAuthorizationHeader(final ActivityPackage activityPackage) {
-        Map<String, String> parameters = activityPackage.getParameters();
-        String activityKindString = activityPackage.getActivityKind().toString();
+    private String buildAndExtractAuthorizationHeader(final Map<String, String> parameters,
+                                                      final ActivityKind activityKind) {
+        String activityKindString = activityKind.toString();
 
         String secretId = extractSecretId(parameters);
         String headersId = extractHeadersId(parameters);

Adjust/sdk-plugin-criteo/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.28.2'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.3'
 }
 
 task adjustCriteoAndroidAar (type: Copy) {

Adjust/sdk-plugin-imei/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.2'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.3'
 }
 
 task adjustImeiAndroidAar (type: Copy) {

Adjust/sdk-plugin-oaid/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:4.28.2'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.3'
 }
 
 task adjustOaidAndroidAar (type: Copy) {

Adjust/sdk-plugin-sociomantic/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.2'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.3'
 }
 
 task adjustSociomanticAndroidAar (type: Copy) {

Adjust/sdk-plugin-trademob/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.2'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.3'
 }
 
 task adjustTrademobAndroidAar (type: Copy) {

Adjust/sdk-plugin-webbridge/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.2'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.3'
 }
 
 task adjustWebBridgeAndroidAar (type: Copy) {