Merge branch 'release/2.2.1'

snowplow · Aug 16, 2021 · 0bb6ddf · 0bb6ddf
2 parents 46ff630 + 94870c2
commit 0bb6ddf
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 6 deletions.
diff --git a/CHANGELOG → CHANGELOG.md b/CHANGELOG → CHANGELOG.md
@@ -1,4 +1,8 @@
 
+Version 2.2.1 (2021-08-16)
+--------------------------
+Fix Session UserID not consistent among tracker instances (#466)
+
 Version 2.2.0 (2021-07-16)
 --------------------------
 Set amended v_tracker indicating wrapper tracker version (#465)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.2.0
+2.2.1
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 subprojects {
     group = 'com.snowplowanalytics'
-    version = '2.2.0'
+    version = '2.2.1'
     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=2.2.0
+VERSION_NAME=2.2.1
 
 POM_NAME=snowplow-android-tracker
 POM_PACKAGING=aar

diff --git a/...plow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/SessionTest.java b/...plow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/SessionTest.java
@@ -41,6 +41,7 @@ protected void setUp() throws Exception {
         super.setUp();
         Context context = getContext();
         cleanSharedPreferences(context, TrackerConstants.SNOWPLOW_SESSION_VARS);
+        cleanSharedPreferences(context, TrackerConstants.SNOWPLOW_GENERAL_VARS);
     }
 
     public void testSessionInit() {
@@ -66,6 +67,7 @@ public void testFirstSession() {
         Session session = getSession(3, 3);
 
         Map<String, Object> sessionContext = getSessionContext(session,"event_1");
+        assertNotNull(sessionContext.get(Parameters.SESSION_USER_ID));
         String sessionId = (String)sessionContext.get(Parameters.SESSION_ID);
         assertEquals(1, session.getSessionIndex());
         assertNotNull(sessionContext.get(Parameters.SESSION_INDEX));

diff --git a/...ker/src/main/java/com/snowplowanalytics/snowplow/internal/constants/TrackerConstants.java b/...ker/src/main/java/com/snowplowanalytics/snowplow/internal/constants/TrackerConstants.java
@@ -50,6 +50,8 @@ public class TrackerConstants {
     public static final String EVENT_ECOMM_ITEM = "ti";
 
     public static final String SNOWPLOW_SESSION_VARS = "snowplow_session_vars";
+    public static final String SNOWPLOW_GENERAL_VARS = "snowplow_general_vars";
+    public static final String INSTALLATION_USER_ID = "SPInstallationUserId";
 
     public static final String INSTALLED_BEFORE = "installed_before";
     public static final String INSTALL_TIMESTAMP = "install_timestamp";

diff --git a/snowplow-tracker/src/main/java/com/snowplowanalytics/snowplow/internal/session/Session.java b/snowplow-tracker/src/main/java/com/snowplowanalytics/snowplow/internal/session/Session.java
@@ -13,6 +13,7 @@
 
 package com.snowplowanalytics.snowplow.internal.session;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.StrictMode;
@@ -134,6 +135,7 @@ public Session(long foregroundTimeout, long backgroundTimeout, @NonNull TimeUnit
         this(foregroundTimeout, backgroundTimeout, timeUnit, null, context);
     }
 
+    @SuppressLint("ApplySharedPref")
     @Deprecated
     public Session(long foregroundTimeout, long backgroundTimeout, @NonNull TimeUnit timeUnit, @Nullable String namespace, @NonNull Context context) {
         this.foregroundTimeout = timeUnit.toMillis(foregroundTimeout);
@@ -175,6 +177,18 @@ public Session(long foregroundTimeout, long backgroundTimeout, @NonNull TimeUnit
         } finally {
             StrictMode.setThreadPolicy(oldPolicy);
         }
+
+        // Get or Set the Session UserID
+        SharedPreferences generalPref = context.getSharedPreferences(TrackerConstants.SNOWPLOW_GENERAL_VARS, Context.MODE_PRIVATE);
+        String storedUserId = generalPref.getString(TrackerConstants.INSTALLATION_USER_ID, null);
+        if (storedUserId != null) {
+            userId = storedUserId;
+        } else if (userId != null) {
+            generalPref.edit()
+                    .putString(TrackerConstants.INSTALLATION_USER_ID, userId)
+                    .commit();
+        }
+
         Logger.v(TAG, "Tracker Session Object created.");
     }
 
@@ -237,7 +251,6 @@ private synchronized void updateSession(String eventId) {
         }
 
         SharedPreferences.Editor editor = sharedPreferences.edit();
-        editor.putString(Parameters.SESSION_USER_ID, userId);
         editor.putString(Parameters.SESSION_ID, currentSessionId);
         editor.putString(Parameters.SESSION_PREVIOUS_ID, previousSessionId);
         editor.putInt(Parameters.SESSION_INDEX, sessionIndex);
@@ -352,11 +365,11 @@ private SharedPreferences getSessionFromSharedPreferences(@NonNull Context conte
         StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
         try {
             SharedPreferences sharedPreferences = context.getSharedPreferences(sessionVarsName, Context.MODE_PRIVATE);
-            if (sharedPreferences.contains(Parameters.SESSION_USER_ID)) {
+            if (sharedPreferences.contains(Parameters.SESSION_ID)) {
                 return sharedPreferences;
             } else {
                 sharedPreferences = context.getSharedPreferences(TrackerConstants.SNOWPLOW_SESSION_VARS, Context.MODE_PRIVATE);
-                if (sharedPreferences.contains(Parameters.SESSION_USER_ID)) {
+                if (sharedPreferences.contains(Parameters.SESSION_ID)) {
                     return sharedPreferences;
                 }
             }