feature: add custom mode management for privacy

at-internet · Mar 1, 2021 · fa242e5 · fa242e5
1 parent 4810127
commit fa242e5
Show file tree

Hide file tree

Showing 9 changed files with 207 additions and 72 deletions.
diff --git a/ATMobileAnalytics/TestApp/build.gradle b/ATMobileAnalytics/TestApp/build.gradle
@@ -35,6 +35,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation project(':Tracker')
+    //implementation 'com.atinternet:Tracker:2.20.2'
     implementation 'com.google.android.gms:play-services-ads:16.0.0'
     implementation 'com.huawei.hms:hms-ads-identifier:3.4.26.303'
 

diff --git a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/MainActivity.java b/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/MainActivity.java
@@ -8,11 +8,9 @@
 
 import com.atinternet.tracker.ATInternet;
 import com.atinternet.tracker.Privacy;
-import com.atinternet.tracker.Screen;
 import com.atinternet.tracker.Tracker;
 
 import java.util.HashMap;
-import java.util.Map;
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
 
@@ -27,23 +25,21 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.setVisitorExempt).setOnClickListener(this);
         findViewById(R.id.setVisitorNoConsent).setOnClickListener(this);
         findViewById(R.id.setVisitorNone).setOnClickListener(this);
+        findViewById(R.id.setVisitorCustom1).setOnClickListener(this);
+        findViewById(R.id.setVisitorCustom2).setOnClickListener(this);
         findViewById(R.id.sendHit).setOnClickListener(this);
         findViewById(R.id.sendHitPage).setOnClickListener(this);
         findViewById(R.id.goToSecondScreen).setOnClickListener(this);
 
-        tracker = ATInternet.getInstance().getDefaultTracker()
-                .setDefaultListener();
+        tracker = ATInternet.getInstance().getDefaultTracker().setDefaultListener();
         tracker.setConfig(new HashMap<String, Object>() {{
             put("logSSL", "logs");
-            put("log", "logp");
             put("domain", "xiti.com");
-            put("pixelPath", "/hit.xiti");
             put("identifier", "uuid");
-            put("site", 999999);
-            put("UUIDDuration", 1);
+            put("site", 410501);
         }}, null, true);
-        Privacy.extendIncludeBuffer("events_name", "events_data_av_duration", "events_data_av_p*", "stc_test6");
-        Privacy.extendIncludeBuffer(Privacy.VisitorMode.Exempt, "events_name", "events_data_av_duration", "events_data_av_p*", "stc_test6");
+        Privacy.extendIncludeBuffer("test");
+        Privacy.extendIncludeBuffer(Privacy.VisitorMode.Exempt, "test");
     }
 
     @Override
@@ -64,6 +60,13 @@ public void onClick(View v) {
             case R.id.setVisitorNone:
                 Privacy.setVisitorMode(Privacy.VisitorMode.None);
                 break;
+            case R.id.setVisitorCustom1:
+                Privacy.setVisitorMode("custom1", true, null, 1);
+                Privacy.extendIncludeBufferForVisitorMode("custom1", "p");
+                break;
+            case R.id.setVisitorCustom2:
+                Privacy.setVisitorMode("custom2", false, "pas-consent");
+                break;
             case R.id.sendHit:
                 tracker.CustomObjects().add(new HashMap<String, Object>() {{
                     put("test", "12");
@@ -72,10 +75,11 @@ public void onClick(View v) {
                 tracker.AVInsights().Media().playbackStart(0, null);
                 break;
             case R.id.sendHitPage:
-                tracker.CustomObjects().add(new HashMap<String, Object>() {{
-                    put("test", "12");
-                    put("test6", "2");
-                }});
+                tracker.Screens().add("homepage");
+                tracker.setProps(new HashMap<String, String>() {{
+                    put("n:contentId", "1234");
+                    put("ressort", "politics");
+                }}, false);
                 tracker.Screens().add("test_privacy").sendView();
                 break;
             case R.id.goToSecondScreen:

diff --git a/ATMobileAnalytics/TestApp/src/main/res/layout/activity_main.xml b/ATMobileAnalytics/TestApp/src/main/res/layout/activity_main.xml
@@ -44,6 +44,18 @@
             android:layout_height="wrap_content"
             android:text="set Visitor None" />
 
+        <Button
+            android:id="@+id/setVisitorCustom1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="set Visitor Custom1" />
+
+        <Button
+            android:id="@+id/setVisitorCustom2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="set Visitor Custom2" />
+
         <Button
             android:id="@+id/sendHit"
             android:layout_width="wrap_content"

diff --git a/ATMobileAnalytics/Tracker/build.gradle b/ATMobileAnalytics/Tracker/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'jacoco'
 apply from: './publish-mavencentral.gradle'
 
 group = 'com.atinternet'
-version = '2.20.2'
+version = '2.21.0'
 
 android {
     compileSdkVersion 30

diff --git a/ATMobileAnalytics/Tracker/publish-mavencentral.gradle b/ATMobileAnalytics/Tracker/publish-mavencentral.gradle
@@ -15,7 +15,7 @@ publishing {
         release(MavenPublication) {
             groupId 'com.atinternet'
             artifactId 'Tracker'
-            version '2.20.2'
+            version '2.21.0'
 
             artifact(project.buildDir.absolutePath + "/outputs/aar/${project.getName()}-release.aar")
             artifact androidSourcesJar

diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java
@@ -453,7 +453,7 @@ public void run() {
         ArrayList<String> urls = buildResult.first;
         String oltParameter = buildResult.second;
 
-        if ((TechnicalContext.optOutEnabled(Tracker.getAppContext()) || Privacy.getVisitorMode() == Privacy.VisitorMode.OptOut) && !((boolean) tracker.getConfiguration().get(TrackerConfigurationKeys.SEND_HIT_WHEN_OPT_OUT))) {
+        if ((TechnicalContext.optOutEnabled(Tracker.getAppContext()) || Privacy.getVisitorModeString().equals(Privacy.VisitorMode.OptOut.name())) && !((boolean) tracker.getConfiguration().get(TrackerConfigurationKeys.SEND_HIT_WHEN_OPT_OUT))) {
             Tool.executeCallback(tracker.getListener(), Tool.CallbackType.WARNING, "'sendHitWhenOptOut' configuration disabled, hit(s) not sent");
             return;
         }
@@ -1060,7 +1060,7 @@ class TechnicalContext {
     static final Closure VTAG = new Closure() {
         @Override
         public String execute() {
-            return "2.20.2";
+            return "2.21.0";
         }
     };