fix: added synchronization to RudderContext (#372)

fix: added synchronization to RudderContext synchronize the RudderContext.persistTraits
rudderlabs · Jan 24, 2024 · ad9baa0 · ad9baa0
1 parent 891f50b
commit ad9baa0
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 20 deletions.
diff --git a/core/src/main/java/com/rudderstack/android/sdk/core/RudderApp.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderApp.java
@@ -9,30 +9,39 @@
 
 class RudderApp {
     @SerializedName("build")
-    private String build;
+    private final String build;
     @SerializedName("name")
-    private String name;
+    private final String name;
     @SerializedName("namespace")
-    private String nameSpace;
+    private final String nameSpace;
     @SerializedName("version")
-    private String version;
+    private final String version;
 
     // internal constructor
     // to be used while creating a cache of context
     RudderApp(Application application) {
+        String buildValue = null;
+        String nameValue = null;
+        String nameSpaceValue = null;
+        String versionValue = null;
         try {
             String packageName = application.getPackageName();
             PackageManager packageManager = application.getPackageManager();
             PackageInfo packageInfo = packageManager.getPackageInfo(packageName, 0);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
-                this.build = Long.toString(packageInfo.getLongVersionCode());
-            else this.build = Integer.toString(packageInfo.versionCode);
-            this.name = packageInfo.applicationInfo.loadLabel(packageManager).toString();
-            this.nameSpace = packageName;
-            this.version = packageInfo.versionName;
+            buildValue = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)?
+                Long.toString(packageInfo.getLongVersionCode()): Integer.toString(packageInfo.versionCode);
+            nameValue = packageInfo.applicationInfo.loadLabel(packageManager).toString();
+            nameSpaceValue = packageName;
+            versionValue = packageInfo.versionName;
         } catch (PackageManager.NameNotFoundException ex) {
             ReportManager.reportError(ex);
             RudderLogger.logError(ex.getCause());
         }
+        finally {
+            this.build = buildValue;
+            this.name = nameValue;
+            this.nameSpace = nameSpaceValue;
+            this.version = versionValue;
+        }
     }
 }
diff --git a/core/src/main/java/com/rudderstack/android/sdk/core/RudderClient.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderClient.java
@@ -37,7 +37,7 @@ public class RudderClient {
     private static RudderOption defaultOptions;
     private static String deviceToken;
     private static String authToken;
-    private static ReentrantLock reentrantLock = new ReentrantLock();
+    private static final ReentrantLock reentrantLock = new ReentrantLock();
 
 
     private static final int NUMBER_OF_FLUSH_CALLS_IN_QUEUE = 1;

diff --git a/core/src/main/java/com/rudderstack/android/sdk/core/RudderContext.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderContext.java
@@ -118,7 +118,9 @@ public class RudderContext {
     void resetTraits() {
         RudderTraits traits = new RudderTraits();
         // convert the whole traits to map and take care of the extras
-        this.traits = Utils.convertToMap(RudderGson.getInstance().toJson(traits));
+        synchronized (this) {
+            this.traits = Utils.convertToMap(RudderGson.getInstance().toJson(traits));
+        }
     }
 
     void updateTraits(RudderTraits traits) {
@@ -135,13 +137,17 @@ void updateTraits(RudderTraits traits) {
 
         // If a user is already loggedIn and then a new user tries to login
         if (existingId != null && newId != null && !existingId.equals(newId)) {
-            this.traits = traitsMap;
+            synchronized (this) {
+                this.traits = traitsMap;
+            }
             resetExternalIds();
             return;
         }
 
         // update traits object here
-        this.traits.putAll(traitsMap);
+        synchronized (this) {
+            this.traits.putAll(traitsMap);
+        }
 
     }
 
@@ -154,7 +160,9 @@ void persistTraits() {
         try {
             if (RudderClient.getApplication() != null) {
                 RudderPreferenceManager preferenceManger = RudderPreferenceManager.getInstance(RudderClient.getApplication());
-                preferenceManger.saveTraits(RudderGson.getInstance().toJson(this.traits));
+                synchronized (this) {
+                    preferenceManger.saveTraits(RudderGson.getInstance().toJson(this.traits));
+                }
             }
         } catch (NullPointerException ex) {
             ReportManager.reportError(ex);
@@ -386,7 +394,9 @@ RudderContext copy() {
 
         copy.app = this.app;
         if (this.traits != null) {
-            copy.traits = new HashMap<>(this.traits);
+            synchronized (this) {
+                copy.traits = new HashMap<>(this.traits);
+            }
         }
         copy.libraryInfo = this.libraryInfo;
         copy.osInfo = this.osInfo;

diff --git a/core/src/main/java/com/rudderstack/android/sdk/core/RudderLibraryInfo.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderLibraryInfo.java
@@ -4,7 +4,7 @@
 
 class RudderLibraryInfo {
     @SerializedName("name")
-    private String name = BuildConfig.LIBRARY_PACKAGE_NAME;
+    private final String name = BuildConfig.LIBRARY_PACKAGE_NAME;
     @SerializedName("version")
-    private String version = BuildConfig.VERSION_NAME;
+    private final String version = BuildConfig.VERSION_NAME;
 }
diff --git a/core/src/main/java/com/rudderstack/android/sdk/core/RudderOSInfo.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderOSInfo.java
@@ -6,7 +6,7 @@
 
 class RudderOSInfo {
     @SerializedName("name")
-    private String name = "Android";
+    private final String name = "Android";
     @SerializedName("version")
-    private String version = Build.VERSION.RELEASE;
+    private final String version = Build.VERSION.RELEASE;
 }