fixes for traits after reset

rudderlabs · Dec 12, 2019 · 54d3955 · 54d3955
1 parent 170f6e9
commit 54d3955
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 32 deletions.
diff --git a/rudder-sdk-core/src/main/java/com/rudderlabs/android/sdk/core/RudderContext.java b/rudder-sdk-core/src/main/java/com/rudderlabs/android/sdk/core/RudderContext.java
@@ -70,12 +70,12 @@ private RudderContext() {
     void updateTraits(RudderTraits traits) {
         // if traits is null reset the traits to a new one with only anonymousId
         if (traits == null) {
-            this.traits = Utils.convertToMap(new Gson().toJson(new RudderTraits(this.getDeviceId())));
+            traits = new RudderTraits(this.getDeviceId());
         }
 
         // convert the whole traits to map and take care of the extras
         Map<String, Object> traitsMap = Utils.convertToMap(new Gson().toJson(traits));
-        if (traits != null && traits.getExtras() != null) traitsMap.putAll(traits.getExtras());
+        if (traits.getExtras() != null) traitsMap.putAll(traits.getExtras());
 
         // update traits object here
         this.traits = traitsMap;

diff --git a/rudder-sdk-core/src/main/java/com/rudderlabs/android/sdk/core/RudderElementCache.java b/rudder-sdk-core/src/main/java/com/rudderlabs/android/sdk/core/RudderElementCache.java
@@ -27,6 +27,7 @@ static RudderContext getCachedContext() {
 
     static void reset() {
         cachedContext.updateTraits(null);
+        persistTraits();
     }
 
     static void persistTraits() {

diff --git a/rudder-sdk-sample-kotlin/src/main/java/com/rudderlabs/android/sample/kotlin/MainActivity.kt b/rudder-sdk-sample-kotlin/src/main/java/com/rudderlabs/android/sample/kotlin/MainActivity.kt
@@ -7,40 +7,24 @@ import com.rudderlabs.android.sdk.core.*
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
-    private var rudderClient: RudderClient? = null
-
     private var count = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        initBtn.setOnClickListener {
-            rudderClient = RudderClient.getInstance(
-                this,
-                writeKey.text.toString(),
-                RudderConfig.Builder()
-                    .withEndPointUri(endPointUrl.text.toString())
-                    .withLogLevel(
-                        when (BuildConfig.DEBUG) {
-                            true -> RudderLogger.RudderLogLevel.DEBUG
-                            false -> RudderLogger.RudderLogLevel.NONE
-                        }
-                    )
-                    .build()
-            );
-        }
+        val rudderClient = MainApplication.rudderClient
 
         trackBtn.setOnClickListener {
             if (rudderClient == null) return@setOnClickListener
 
-            rudderClient!!.track("some_test_event")
+            rudderClient.track("some_test_event")
         }
 
         screenBtn.setOnClickListener {
             if (rudderClient == null) return@setOnClickListener
 
-            rudderClient!!.screen(this.localClassName)
+            rudderClient.screen(this.localClassName)
         }
 
         identifyBtn.setOnClickListener {
@@ -58,7 +42,7 @@ class MainActivity : AppCompatActivity() {
                 .put("userId", userId.text.toString())
                 .put("some_test_key", "some_test_value")
 
-            rudderClient!!.identify(
+            rudderClient.identify(
                 "some_user_id",
                 traits,
                 null
@@ -68,7 +52,7 @@ class MainActivity : AppCompatActivity() {
         resetBtn.setOnClickListener {
             if (rudderClient == null) return@setOnClickListener
 
-            rudderClient!!.reset()
+            rudderClient.reset()
         }
     }
 

diff --git a/...r-sdk-sample-kotlin/src/main/java/com/rudderlabs/android/sample/kotlin/MainApplication.kt b/...r-sdk-sample-kotlin/src/main/java/com/rudderlabs/android/sample/kotlin/MainApplication.kt
@@ -1,6 +1,7 @@
 package com.rudderlabs.android.sample.kotlin
 
 import android.app.Application
+import android.content.res.Resources
 import com.rudderlabs.android.integration.dummy.DummyGAIntegrationImpl
 import com.rudderlabs.android.sdk.core.RudderClient
 import com.rudderlabs.android.sdk.core.RudderConfig
@@ -11,9 +12,26 @@ class MainApplication : Application() {
     companion object {
         private const val WRITE_KEY = "1TSRSskqa15PG7F89tkwEbl5Td8"
         private const val END_POINT_URI = "https://664970a4.ngrok.io"
+        var rudderClient: RudderClient? = null
     }
 
     override fun onCreate() {
         super.onCreate()
-    }
+
+        val writeKey = resources.getString(R.string.write_key)
+        val endPointUrl = resources.getString(R.string.end_point_url)
+
+        rudderClient = RudderClient.getInstance(
+            this,
+            writeKey,
+            RudderConfig.Builder()
+                .withEndPointUri(endPointUrl)
+                .withLogLevel(
+                    when (BuildConfig.DEBUG) {
+                        true -> RudderLogger.RudderLogLevel.DEBUG
+                        false -> RudderLogger.RudderLogLevel.NONE
+                    }
+                )
+                .build()
+        ); }
 }
diff --git a/rudder-sdk-sample-kotlin/src/main/res/layout/activity_main.xml b/rudder-sdk-sample-kotlin/src/main/res/layout/activity_main.xml
@@ -25,6 +25,7 @@
                 android:id="@+id/writeKey"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:enabled="false"
                 android:hint="writeKey"
                 android:text="@string/write_key" />
         </com.google.android.material.textfield.TextInputLayout>
@@ -38,6 +39,7 @@
                 android:id="@+id/endPointUrl"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:enabled="false"
                 android:hint="endPointUrl"
                 android:text="@string/end_point_url" />
         </com.google.android.material.textfield.TextInputLayout>
@@ -55,13 +57,6 @@
                 android:text="some_user_id" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <Button
-            android:id="@+id/initBtn"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="16dp"
-            android:text="initialize" />
-
         <Button
             android:id="@+id/trackBtn"
             android:layout_width="match_parent"

diff --git a/rudder-sdk-sample-kotlin/src/main/res/values/strings.xml b/rudder-sdk-sample-kotlin/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
     <string name="app_name">RudderAndroidClient</string>
-    <string name="end_point_url">https://3adef4f6.ngrok.io</string>
+    <string name="end_point_url">https://f063e183.ngrok.io</string>
     <string name="write_key">1TSRSskqa15PG7F89tkwEbl5Td8</string>
 </resources>