Version 4.28.0

CHANGELOG.md

@@ -1,3 +1,13 @@
+### Version 4.28.0 (2nd April 2021)
+#### Changed
+- Removed native iOS legacy code.
+
+#### Native SDKs
+- [iOS@v4.28.0][ios_sdk_v4.28.0]
+- [Android@v4.27.0][android_sdk_v4.27.0]
+
+---
+
 ### Version 4.22.1 (5th January 2021)
 #### Fixed
 - Fixed `AppTrackingTransparency` framework linking issue which caused crashes on pre iOS 14 devices.
@@ -483,6 +493,7 @@
 [ios_sdk_v4.21.1]: https://github.com/adjust/ios_sdk/tree/v4.21.1
 [ios_sdk_v4.21.3]: https://github.com/adjust/ios_sdk/tree/v4.21.3
 [ios_sdk_v4.24.0]: https://github.com/adjust/ios_sdk/tree/v4.24.0
+[ios_sdk_v4.28.0]: https://github.com/adjust/ios_sdk/tree/v4.28.0
 
 [android_sdk_v2.1.3]: https://github.com/adjust/android_sdk/tree/v2.1.3
 [android_sdk_v2.1.4]: https://github.com/adjust/android_sdk/tree/v2.1.4
@@ -505,3 +516,4 @@
 [android_sdk_v4.18.4]: https://github.com/adjust/android_sdk/tree/v4.18.4
 [android_sdk_v4.21.1]: https://github.com/adjust/android_sdk/tree/v4.21.1
 [android_sdk_v4.25.0]: https://github.com/adjust/android_sdk/tree/v4.25.0
+[android_sdk_v4.27.0]: https://github.com/adjust/android_sdk/tree/v4.27.0

VERSION

@@ -1 +1 @@
-4.22.1
+4.28.0

doc/migrate.md

@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for Adobe AIR to 4.22.1 from 3.4.3
+## Migrate your Adjust SDK for Adobe AIR to 4.28.0 from 3.4.3
 
 ### SDK initialization
 

example/Main-app.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?> 
 <application xmlns="http://ns.adobe.com/air/application/33.1"> 
   <id>com.adjust.examples</id> 
-  <versionNumber>4.22.1</versionNumber> 
+  <versionNumber>4.28.0</versionNumber> 
   <filename>Adjust AIR SDK Demo</filename> 
 
   <initialWindow>

ext/android/src/AdjustExtension/extension/src/main/java/com/adjust/sdk/ActivityHandler.java

@@ -17,6 +17,9 @@
 import android.net.Uri;
 import android.os.Handler;
 
+import com.adjust.sdk.network.ActivityPackageSender;
+import com.adjust.sdk.network.IActivityPackageSender;
+import com.adjust.sdk.network.UtilNetworking;
 import com.adjust.sdk.scheduler.SingleThreadCachedScheduler;
 import com.adjust.sdk.scheduler.ThreadExecutor;
 import com.adjust.sdk.scheduler.TimerCycle;
@@ -358,6 +361,7 @@ public void run() {
     public void finishedTrackingActivity(ResponseData responseData) {
         // redirect session responses to attribution handler to check for attribution information
         if (responseData instanceof SessionResponseData) {
+            logger.debug("Finished tracking session");
             attributionHandler.checkSessionResponse((SessionResponseData)responseData);
             return;
         }
@@ -466,6 +470,16 @@ public void run() {
         });
     }
 
+    @Override
+    public void sendPreinstallReferrer() {
+        executor.submit(new Runnable() {
+            @Override
+            public void run() {
+                sendPreinstallReferrerI();
+            }
+        });
+    }
+
     @Override
     public void sendInstallReferrer(final ReferrerDetails referrerDetails,
                                     final String referrerApi) {
@@ -628,6 +642,26 @@ public void run() {
         });
     }
 
+    @Override
+    public void trackThirdPartySharing(final AdjustThirdPartySharing adjustThirdPartySharing) {
+        executor.submit(new Runnable() {
+            @Override
+            public void run() {
+                trackThirdPartySharingI(adjustThirdPartySharing);
+            }
+        });
+    }
+
+    @Override
+    public void trackMeasurementConsent(final boolean consentMeasurement) {
+        executor.submit(new Runnable() {
+            @Override
+            public void run() {
+                trackMeasurementConsentI(consentMeasurement);
+            }
+        });
+    }
+
     @Override
     public void trackAdRevenue(final String source, final JSONObject adRevenueJson) {
         executor.submit(new Runnable() {
@@ -694,21 +728,6 @@ public AdjustAttribution getAttribution() {
         return attribution;
     }
 
-    @Override
-    public String getBasePath() {
-        return this.basePath;
-    }
-
-    @Override
-    public String getGdprPath() {
-        return this.gdprPath;
-    }
-
-    @Override
-    public String getSubscriptionPath() {
-        return this.subscriptionPath;
-    }
-
     public InternalState getInternalState() {
         return internalState;
     }
@@ -730,10 +749,7 @@ private void initI() {
         readSessionPartnerParametersI(adjustConfig.context);
 
         if (adjustConfig.startEnabled != null) {
-            if (adjustConfig.preLaunchActionsArray == null) {
-                adjustConfig.preLaunchActionsArray = new ArrayList<IRunActivityHandler>();
-            }
-            adjustConfig.preLaunchActionsArray.add(new IRunActivityHandler() {
+            adjustConfig.preLaunchActions.preLaunchActionsArray.add(new IRunActivityHandler() {
                 @Override
                 public void run(ActivityHandler activityHandler) {
                     activityHandler.setEnabledI(adjustConfig.startEnabled);
@@ -799,8 +815,24 @@ public void run(ActivityHandler activityHandler) {
             SharedPreferencesManager sharedPreferencesManager = new SharedPreferencesManager(getContext());
             if (sharedPreferencesManager.getGdprForgetMe()) {
                 gdprForgetMe();
-            } else if (sharedPreferencesManager.getDisableThirdPartySharing()) {
-                disableThirdPartySharing();
+            } else {
+                if (sharedPreferencesManager.getDisableThirdPartySharing()) {
+                    disableThirdPartySharing();
+                }
+                for (AdjustThirdPartySharing adjustThirdPartySharing :
+                        adjustConfig.preLaunchActions.preLaunchAdjustThirdPartySharingArray)
+                {
+                    trackThirdPartySharing(adjustThirdPartySharing);
+                }
+                if (adjustConfig.preLaunchActions.lastMeasurementConsentTracked != null) {
+                    trackMeasurementConsent(
+                            adjustConfig.preLaunchActions.
+                                    lastMeasurementConsentTracked.booleanValue());
+                }
+
+                adjustConfig.preLaunchActions.preLaunchAdjustThirdPartySharingArray =
+                        new ArrayList<>();
+                adjustConfig.preLaunchActions.lastMeasurementConsentTracked = null;
             }
         }
 
@@ -841,15 +873,44 @@ public void run() {
 
         UtilNetworking.setUserAgent(adjustConfig.userAgent);
 
-        this.basePath = adjustConfig.basePath;
-        this.gdprPath = adjustConfig.gdprPath;
-        this.subscriptionPath = adjustConfig.subscriptionPath;
-
-        packageHandler = AdjustFactory.getPackageHandler(this, adjustConfig.context, toSendI(false));
-
-        attributionHandler = AdjustFactory.getAttributionHandler(this, toSendI(false));
-
-        sdkClickHandler = AdjustFactory.getSdkClickHandler(this, toSendI(true));
+        IActivityPackageSender packageHandlerActivitySender =
+                new ActivityPackageSender(
+                        adjustConfig.urlStrategy,
+                        adjustConfig.basePath,
+                        adjustConfig.gdprPath,
+                        adjustConfig.subscriptionPath,
+                        deviceInfo.clientSdk);
+        packageHandler = AdjustFactory.getPackageHandler(
+                this,
+                adjustConfig.context,
+                toSendI(false),
+                packageHandlerActivitySender);
+
+        IActivityPackageSender attributionHandlerActivitySender =
+                new ActivityPackageSender(
+                        adjustConfig.urlStrategy,
+                        adjustConfig.basePath,
+                        adjustConfig.gdprPath,
+                        adjustConfig.subscriptionPath,
+                        deviceInfo.clientSdk);
+
+        attributionHandler = AdjustFactory.getAttributionHandler(
+                this,
+                toSendI(false),
+                attributionHandlerActivitySender);
+
+        IActivityPackageSender sdkClickHandlerActivitySender =
+                new ActivityPackageSender(
+                        adjustConfig.urlStrategy,
+                        adjustConfig.basePath,
+                        adjustConfig.gdprPath,
+                        adjustConfig.subscriptionPath,
+                        deviceInfo.clientSdk);
+
+        sdkClickHandler = AdjustFactory.getSdkClickHandler(
+                this,
+                toSendI(true),
+                sdkClickHandlerActivitySender);
 
         if (isToUpdatePackagesI()) {
             updatePackagesI();
@@ -869,14 +930,18 @@ public void onInstallReferrerRead(ReferrerDetails referrerDetails) {
             }
         });
 
-        preLaunchActionsI(adjustConfig.preLaunchActionsArray);
+        preLaunchActionsI(adjustConfig.preLaunchActions.preLaunchActionsArray);
         sendReftagReferrerI();
     }
 
     private void checkForPreinstallI() {
         if (activityState == null) return;
         if (!activityState.enabled) return;
         if (activityState.isGdprForgotten) return;
+
+        // sending preinstall referrer doesn't require preinstall tracking flag to be enabled
+        sendPreinstallReferrerI();
+
         if (!adjustConfig.preinstallTrackingEnabled) return;
         if (internalState.hasPreinstallBeenRead()) return;
 
@@ -1082,6 +1147,21 @@ private void startFirstSessionI() {
                 if (sharedPreferencesManager.getDisableThirdPartySharing()) {
                     disableThirdPartySharingI();
                 }
+                for (AdjustThirdPartySharing adjustThirdPartySharing :
+                        adjustConfig.preLaunchActions.preLaunchAdjustThirdPartySharingArray)
+                {
+                    trackThirdPartySharingI(adjustThirdPartySharing);
+                }
+                if (adjustConfig.preLaunchActions.lastMeasurementConsentTracked != null) {
+                    trackMeasurementConsentI(
+                            adjustConfig.preLaunchActions.
+                                    lastMeasurementConsentTracked.booleanValue());
+                }
+
+                adjustConfig.preLaunchActions.preLaunchAdjustThirdPartySharingArray =
+                        new ArrayList<>();
+                adjustConfig.preLaunchActions.lastMeasurementConsentTracked = null;
+
 
                 activityState.sessionCount = 1; // this is the first session
                 transferSessionPackageI(now);
@@ -1306,6 +1386,8 @@ private void launchSdkClickResponseTasksI(SdkClickResponseData sdkClickResponseD
     }
 
     private void launchSessionResponseTasksI(SessionResponseData sessionResponseData) {
+        logger.debug("Launching SessionResponse tasks");
+
         // try to update adid from response
         updateAdidI(sessionResponseData.adid);
 
@@ -1511,12 +1593,29 @@ private void setEnabledI(boolean enabled) {
 
             if (sharedPreferencesManager.getGdprForgetMe()) {
                 gdprForgetMeI();
-            } else if (sharedPreferencesManager.getDisableThirdPartySharing()) {
-                disableThirdPartySharingI();
+            } else {
+                if (sharedPreferencesManager.getDisableThirdPartySharing()) {
+                    disableThirdPartySharingI();
+                }
+                for (AdjustThirdPartySharing adjustThirdPartySharing :
+                        adjustConfig.preLaunchActions.preLaunchAdjustThirdPartySharingArray)
+                {
+                    trackThirdPartySharingI(adjustThirdPartySharing);
+                }
+                if (adjustConfig.preLaunchActions.lastMeasurementConsentTracked != null) {
+                    trackMeasurementConsentI(
+                            adjustConfig.preLaunchActions.
+                                    lastMeasurementConsentTracked.booleanValue());
+                }
+
+                adjustConfig.preLaunchActions.preLaunchAdjustThirdPartySharingArray =
+                        new ArrayList<>();
+                adjustConfig.preLaunchActions.lastMeasurementConsentTracked = null;
             }
 
             // check if install was tracked
             if (!sharedPreferencesManager.getInstallTracked()) {
+                logger.debug("Detected that install was not tracked at enable time");
                 long now = System.currentTimeMillis();
                 trackNewSessionI(now);
             }
@@ -1639,6 +1738,25 @@ private void sendReftagReferrerI() {
         sdkClickHandler.sendReftagReferrers();
     }
 
+    private void sendPreinstallReferrerI() {
+        if (!isEnabledI()) {
+            return;
+        }
+        if (internalState.hasFirstSdkStartNotOcurred()) {
+            return;
+        }
+
+        SharedPreferencesManager sharedPreferencesManager =
+                new SharedPreferencesManager(getContext());
+        String referrerPayload = sharedPreferencesManager.getPreinstallReferrer();
+
+        if (referrerPayload == null || referrerPayload.isEmpty()) {
+            return;
+        }
+
+        sdkClickHandler.sendPreinstallPayload(referrerPayload, Constants.SYSTEM_INSTALLER_REFERRER);
+    }
+
     private void sendInstallReferrerI(ReferrerDetails referrerDetails, String referrerApi) {
         if (!isEnabledI()) {
             return;
@@ -2112,6 +2230,53 @@ private void disableThirdPartySharingI() {
         }
     }
 
+    private void trackThirdPartySharingI(final AdjustThirdPartySharing adjustThirdPartySharing) {
+        if (!checkActivityStateI(activityState)) {
+            adjustConfig.preLaunchActions.preLaunchAdjustThirdPartySharingArray.add(
+                    adjustThirdPartySharing);
+            return;
+        }
+        if (!isEnabledI()) { return; }
+        if (activityState.isGdprForgotten) { return; }
+
+        long now = System.currentTimeMillis();
+        PackageBuilder packageBuilder = new PackageBuilder(
+                adjustConfig, deviceInfo, activityState, sessionParameters, now);
+
+        ActivityPackage activityPackage =
+                packageBuilder.buildThirdPartySharingPackage(adjustThirdPartySharing);
+        packageHandler.addPackage(activityPackage);
+
+        if (adjustConfig.eventBufferingEnabled) {
+            logger.info("Buffered event %s", activityPackage.getSuffix());
+        } else {
+            packageHandler.sendFirstPackage();
+        }
+    }
+
+    private void trackMeasurementConsentI(final boolean consentMeasurement) {
+        if (!checkActivityStateI(activityState)) {
+            adjustConfig.preLaunchActions.lastMeasurementConsentTracked = consentMeasurement;
+            return;
+        }
+        if (!isEnabledI()) { return; }
+        if (activityState.isGdprForgotten) { return; }
+
+        long now = System.currentTimeMillis();
+        PackageBuilder packageBuilder = new PackageBuilder(
+                adjustConfig, deviceInfo, activityState, sessionParameters, now);
+
+        ActivityPackage activityPackage =
+                packageBuilder.buildMeasurementConsentPackage(consentMeasurement);
+        packageHandler.addPackage(activityPackage);
+
+        if (adjustConfig.eventBufferingEnabled) {
+            logger.info("Buffered event %s", activityPackage.getSuffix());
+        } else {
+            packageHandler.sendFirstPackage();
+        }
+    }
+
     private void trackAdRevenueI(String source, JSONObject adRevenueJson) {
         if (!checkActivityStateI(activityState)) { return; }
         if (!isEnabledI()) { return; }