Merge branch 'release/3.0.2'

snowplow · Dec 23, 2021 · 14ae7ba · 14ae7ba
2 parents 8222fbe + 254e136
commit 14ae7ba
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 3.0.2 (2021-12-23)
+--------------------------
+Fix updating IDFA during app runtime (#492)
+
 Version 3.0.1 (2021-12-17)
 --------------------------
 Do not allow multiple state machines with the same ID (#489)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.1
+3.0.2
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 subprojects {
     group = 'com.snowplowanalytics'
-    version = '3.0.1'
+    version = '3.0.2'
     repositories {
         google()
         maven {

diff --git a/gradle.properties b/gradle.properties
@@ -30,7 +30,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000
 SONATYPE_STAGING_PROFILE=comsnowplowanalytics
 GROUP=com.snowplowanalytics
 POM_ARTIFACT_ID=snowplow-android-tracker
-VERSION_NAME=3.0.1
+VERSION_NAME=3.0.2
 
 POM_NAME=snowplow-android-tracker
 POM_PACKAGING=aar

diff --git a/...droidTest/java/com/snowplowanalytics/snowplow/internal/tracker/MockDeviceInfoMonitor.java b/...droidTest/java/com/snowplowanalytics/snowplow/internal/tracker/MockDeviceInfoMonitor.java
@@ -27,6 +27,7 @@
 
 public class MockDeviceInfoMonitor extends DeviceInfoMonitor {
     @NonNull private Map<String, Integer> methodAccessCounts = new HashMap<String, Integer>();
+    @Nullable public String customIdfa = "XJKLJSALFKJ";
 
     @NonNull
     @Override
@@ -67,7 +68,7 @@ public String getCarrier(@NonNull Context context) {
     @Override
     public String getAndroidIdfa(@NonNull Context context) {
         increaseMethodAccessCount("getAndroidIdfa");
-        return "XJKLJSALFKJ";
+        return customIdfa;
     }
 
     @NonNull

diff --git a/...androidTest/java/com/snowplowanalytics/snowplow/internal/tracker/PlatformContextTest.java b/...androidTest/java/com/snowplowanalytics/snowplow/internal/tracker/PlatformContextTest.java
@@ -132,6 +132,28 @@ public void doesntUpdateNonEphemeralInfo() {
         assertEquals(1, deviceInfoMonitor.getMethodAccessCount("getTotalStorage"));
     }
 
+    @Test
+    public void doesntUpdateIdfaIfNotNull() {
+        MockDeviceInfoMonitor deviceInfoMonitor = new MockDeviceInfoMonitor();
+        PlatformContext platformContext = new PlatformContext(0, 1, deviceInfoMonitor, getContext());
+        assertEquals(1, deviceInfoMonitor.getMethodAccessCount("getAndroidIdfa"));
+        platformContext.getMobileContext();
+        assertEquals(1, deviceInfoMonitor.getMethodAccessCount("getAndroidIdfa"));
+    }
+
+    @Test
+    public void updatesIdfaIfEmptyOrNull() {
+        MockDeviceInfoMonitor deviceInfoMonitor = new MockDeviceInfoMonitor();
+        deviceInfoMonitor.customIdfa = "";
+        PlatformContext platformContext = new PlatformContext(0, 1, deviceInfoMonitor, getContext());
+        assertEquals(1, deviceInfoMonitor.getMethodAccessCount("getAndroidIdfa"));
+        deviceInfoMonitor.customIdfa = null;
+        platformContext.getMobileContext();
+        assertEquals(2, deviceInfoMonitor.getMethodAccessCount("getAndroidIdfa"));
+        platformContext.getMobileContext();
+        assertEquals(3, deviceInfoMonitor.getMethodAccessCount("getAndroidIdfa"));
+    }
+
     // --- PRIVATE
 
     private Context getContext() {

diff --git a/...racker/src/main/java/com/snowplowanalytics/snowplow/internal/tracker/PlatformContext.java b/...racker/src/main/java/com/snowplowanalytics/snowplow/internal/tracker/PlatformContext.java
@@ -98,7 +98,6 @@ private void setPlatformDict() {
         Util.addToMap(Parameters.DEVICE_MODEL, deviceInfoMonitor.getDeviceModel(), pairs);
         Util.addToMap(Parameters.DEVICE_MANUFACTURER, deviceInfoMonitor.getDeviceVendor(), pairs);
         Util.addToMap(Parameters.CARRIER, deviceInfoMonitor.getCarrier(context), pairs);
-        Util.addToMap(Parameters.ANDROID_IDFA, deviceInfoMonitor.getAndroidIdfa(context), pairs);
         Util.addToMap(Parameters.PHYSICAL_MEMORY, deviceInfoMonitor.getPhysicalMemory(context), pairs);
         Util.addToMap(Parameters.TOTAL_STORAGE, deviceInfoMonitor.getTotalStorage(), pairs);
 
@@ -109,6 +108,11 @@ private void setPlatformDict() {
     private void setEphemeralPlatformDict() {
         lastUpdatedEphemeralPlatformDict = System.currentTimeMillis();
 
+        Object currentIdfa = pairs.get(Parameters.ANDROID_IDFA);
+        if (currentIdfa == null || currentIdfa.toString().isEmpty()) {
+            Util.addToMap(Parameters.ANDROID_IDFA, deviceInfoMonitor.getAndroidIdfa(context), pairs);
+        }
+
         Pair<String, Integer> batteryInfo = deviceInfoMonitor.getBatteryStateAndLevel(context);
         if (batteryInfo != null) {
             Util.addToMap(Parameters.BATTERY_STATE, batteryInfo.first, pairs);