Merge pull request #331 from adjust/v4130

Version 4.13.0

Adjust/adjust/adjust-proguard-rules.txt

@@ -17,10 +17,10 @@
     java.lang.String CPU_ABI;
 }
 -keep class android.content.res.Configuration {
-    android.os.LocaledList getLocales();
+    android.os.LocaleList getLocales();
     java.util.Locale locale;
 }
--keep class android.os.LocaledList {
+-keep class android.os.LocaleList {
     java.util.Locale get(int);
 }
 -keep public class com.android.installreferrer.** { *; }

Adjust/adjust/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 def getVersionName() {
-    return "4.12.4"
+    return "4.13.0"
 }
 
 android {

Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java

@@ -54,6 +54,7 @@ public class ActivityHandler implements IActivityHandler {
     private TimerOnce delayStartTimer;
     private InternalState internalState;
     private String basePath;
+    private String gdprPath;
 
     private DeviceInfo deviceInfo;
     private AdjustConfig adjustConfig; // always valid after construction
@@ -592,6 +593,26 @@ public void run() {
         });
     }
 
+    @Override
+    public void gdprForgetMe() {
+        scheduledExecutor.submit(new Runnable() {
+            @Override
+            public void run() {
+                gdprForgetMeI();
+            }
+        });
+    }
+
+    @Override
+    public void gotOptOutResponse() {
+        scheduledExecutor.submit(new Runnable() {
+            @Override
+            public void run() {
+                gotOptOutResponseI();
+            }
+        });
+    }
+
     @Override
     public Context getContext() {
         return adjustConfig.context;
@@ -633,6 +654,11 @@ public String getBasePath() {
         return this.basePath;
     }
 
+    @Override
+    public String getGdprPath() {
+        return this.gdprPath;
+    }
+
     public ActivityPackage getAttributionPackageI() {
         long now = System.currentTimeMillis();
         PackageBuilder attributionBuilder = new PackageBuilder(adjustConfig,
@@ -727,6 +753,14 @@ public void run(ActivityHandler activityHandler) {
             }
         }
 
+        // GDPR
+        if (internalState.hasFirstSdkStartOcurred()) {
+            SharedPreferencesManager sharedPreferencesManager = new SharedPreferencesManager(getContext());
+            if (sharedPreferencesManager.getGdprForgetMe()) {
+                gdprForgetMe();
+            }
+        }
+
         foregroundTimer = new TimerCycle(
                 new Runnable() {
                     @Override
@@ -765,6 +799,7 @@ public void run() {
         UtilNetworking.setUserAgent(adjustConfig.userAgent);
 
         this.basePath = adjustConfig.basePath;
+        this.gdprPath = adjustConfig.gdprPath;
 
         packageHandler = AdjustFactory.getPackageHandler(this, adjustConfig.context, toSendI(false));
 
@@ -780,10 +815,8 @@ public void run() {
             updatePackagesI();
         }
 
-        preLaunchActionsI(adjustConfig.preLaunchActionsArray);
-
         installReferrer = new InstallReferrer(adjustConfig.context, this);
-
+        preLaunchActionsI(adjustConfig.preLaunchActionsArray);
         sendReftagReferrerI();
     }
 
@@ -848,13 +881,17 @@ private void startFirstSessionI() {
 
         SharedPreferencesManager sharedPreferencesManager = new SharedPreferencesManager(getContext());
         activityState.pushToken = sharedPreferencesManager.getPushToken();
+        // activityState.isGdprForgotten = sharedPreferencesManager.getGdprForgetMe();
 
         // track the first session package only if it's enabled
         if (internalState.isEnabled()) {
-            activityState.sessionCount = 1; // this is the first session
-            transferSessionPackageI(now);
-
-            checkAfterNewStartI(sharedPreferencesManager);
+            if (!sharedPreferencesManager.getGdprForgetMe()) {
+                activityState.sessionCount = 1; // this is the first session
+                transferSessionPackageI(now);
+                checkAfterNewStartI(sharedPreferencesManager);
+            } else {
+                gdprForgetMeI();
+            }
         }
 
         activityState.resetSessionAttributes(now);
@@ -863,11 +900,16 @@ private void startFirstSessionI() {
 
         writeActivityStateI();
         sharedPreferencesManager.removePushToken();
+        sharedPreferencesManager.removeGdprForgetMe();
 
         // don't check attribution right after first sdk start
     }
 
     private void processSessionI() {
+        if (activityState.isGdprForgotten) {
+            return;
+        }
+
         long now = System.currentTimeMillis();
 
         long lastInterval = now - activityState.lastActivity;
@@ -951,6 +993,7 @@ private void trackEventI(AdjustEvent event) {
         if (!isEnabledI()) return;
         if (!checkEventI(event)) return;
         if (!checkOrderIdI(event.orderId)) return;
+        if (activityState.isGdprForgotten) return;
 
         long now = System.currentTimeMillis();
 
@@ -1213,6 +1256,13 @@ private void setEnabledI(boolean enabled) {
             return;
         }
 
+        if (enabled) {
+            if (activityState.isGdprForgotten) {
+                logger.error("Re-enabling SDK not possible for forgotten user");
+                return;
+            }
+        }
+
         // save new enabled state in internal state
         internalState.enabled = enabled;
 
@@ -1224,9 +1274,16 @@ private void setEnabledI(boolean enabled) {
             return;
         }
 
+        activityState.enabled = enabled;
+        writeActivityStateI();
+
         if (enabled) {
             SharedPreferencesManager sharedPreferencesManager = new SharedPreferencesManager(getContext());
 
+            if (sharedPreferencesManager.getGdprForgetMe()) {
+                gdprForgetMeI();
+            }
+
             // check if install was tracked
             if (!sharedPreferencesManager.getInstallTracked()) {
                 long now = System.currentTimeMillis();
@@ -1235,9 +1292,6 @@ private void setEnabledI(boolean enabled) {
             checkAfterNewStartI(sharedPreferencesManager);
         }
 
-        activityState.enabled = enabled;
-        writeActivityStateI();
-
         updateStatusI(!enabled,
                 "Pausing handlers due to SDK being disabled",
                 "Handlers remain paused",
@@ -1729,6 +1783,7 @@ public void resetSessionPartnerParametersI() {
     private void setPushTokenI(String token) {
         if (!checkActivityStateI(activityState)) { return; }
         if (!isEnabledI()) { return; }
+        if (activityState.isGdprForgotten) { return; }
 
         if (token == null) { return; }
         if (token.equals(activityState.pushToken)) { return; }
@@ -1754,6 +1809,39 @@ private void setPushTokenI(String token) {
         }
     }
 
+    private void gdprForgetMeI() {
+        if (!checkActivityStateI(activityState)) { return; }
+        if (!isEnabledI()) { return; }
+        if (activityState.isGdprForgotten) { return; }
+
+        activityState.isGdprForgotten = true;
+        writeActivityStateI();
+
+        long now = System.currentTimeMillis();
+        PackageBuilder gdprPackageBuilder = new PackageBuilder(adjustConfig, deviceInfo, activityState, sessionParameters, now);
+
+        ActivityPackage gdprPackage = gdprPackageBuilder.buildGdprPackage();
+        packageHandler.addPackage(gdprPackage);
+
+        // If GDPR choice was cached, remove it.
+        SharedPreferencesManager sharedPreferencesManager = new SharedPreferencesManager(getContext());
+        sharedPreferencesManager.removeGdprForgetMe();
+
+        if (adjustConfig.eventBufferingEnabled) {
+            logger.info("Buffered event %s", gdprPackage.getSuffix());
+        } else {
+            packageHandler.sendFirstPackage();
+        }
+    }
+
+    private void gotOptOutResponseI() {
+        activityState.isGdprForgotten = true;
+        writeActivityStateI();
+
+        packageHandler.flush();
+        setEnabledI(false);
+    }
+
     private void readActivityStateI(Context context) {
         try {
             activityState = Util.readObject(context, ACTIVITY_STATE_FILENAME, ACTIVITY_STATE_NAME, ActivityState.class);

Adjust/adjust/src/main/java/com/adjust/sdk/ActivityKind.java

@@ -1,7 +1,7 @@
 package com.adjust.sdk;
 
 public enum ActivityKind {
-    UNKNOWN, SESSION, EVENT, CLICK, ATTRIBUTION, REVENUE, REATTRIBUTION, INFO;
+    UNKNOWN, SESSION, EVENT, CLICK, ATTRIBUTION, REVENUE, REATTRIBUTION, INFO, GDPR;
 
     public static ActivityKind fromString(String string) {
         if ("session".equals(string)) {
@@ -14,6 +14,8 @@ public static ActivityKind fromString(String string) {
             return ATTRIBUTION;
         } else if ("info".equals(string)) {
             return INFO;
+        } else if ("gdpr".equals(string)) {
+            return GDPR;
         } else {
             return UNKNOWN;
         }
@@ -32,6 +34,8 @@ public String toString() {
                 return "attribution";
             case INFO:
                 return "info";
+            case GDPR:
+                return "gdpr";
             default:
                 return "unknown";
         }

Adjust/adjust/src/main/java/com/adjust/sdk/ActivityState.java

@@ -26,6 +26,7 @@ public class ActivityState implements Serializable, Cloneable {
     private static final ObjectStreamField[] serialPersistentFields = {
             new ObjectStreamField("uuid", String.class),
             new ObjectStreamField("enabled", boolean.class),
+            new ObjectStreamField("isGdprForgotten", boolean.class),
             new ObjectStreamField("askingAttribution", boolean.class),
             new ObjectStreamField("eventCount", int.class),
             new ObjectStreamField("sessionCount", int.class),
@@ -46,6 +47,7 @@ public class ActivityState implements Serializable, Cloneable {
     // persistent data
     protected String uuid;
     protected boolean enabled;
+    protected boolean isGdprForgotten;
     protected boolean askingAttribution;
 
     // global counters
@@ -76,6 +78,7 @@ protected ActivityState() {
         // create UUID for new devices
         uuid = Util.createUuid();
         enabled = true;
+        isGdprForgotten = false;
         askingAttribution = false;
         eventCount = 0; // no events yet
         sessionCount = 0; // the first session just started
@@ -136,6 +139,7 @@ public boolean equals(Object other) {
 
         if (!Util.equalString(uuid, otherActivityState.uuid)) return false;
         if (!Util.equalBoolean(enabled, otherActivityState.enabled)) return false;
+        if (!Util.equalBoolean(isGdprForgotten, otherActivityState.isGdprForgotten)) return false;
         if (!Util.equalBoolean(askingAttribution, otherActivityState.askingAttribution)) return false;
         if (!Util.equalInt(eventCount, otherActivityState.eventCount)) return false;
         if (!Util.equalInt(sessionCount, otherActivityState.sessionCount)) return false;
@@ -158,6 +162,7 @@ public int hashCode() {
         int hashCode = 17;
         hashCode = 37 * hashCode + Util.hashString(uuid);
         hashCode = 37 * hashCode + Util.hashBoolean(enabled);
+        hashCode = 37 * hashCode + Util.hashBoolean(isGdprForgotten);
         hashCode = 37 * hashCode + Util.hashBoolean(askingAttribution);
         hashCode = 37 * hashCode + eventCount;
         hashCode = 37 * hashCode + sessionCount;
@@ -189,6 +194,7 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo
         // new fields
         uuid = Util.readStringField(fields, "uuid", null);
         enabled = Util.readBooleanField(fields, "enabled", true);
+        isGdprForgotten = Util.readBooleanField(fields, "isGdprForgotten", false);
         askingAttribution = Util.readBooleanField(fields, "askingAttribution", false);
 
         updatePackages = Util.readBooleanField(fields, "updatePackages", false);