fix device id empty (#183)

segmentio · Sep 26, 2023 · 3abff0d · 3abff0d
1 parent 2dc0174
commit 3abff0d
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/android/src/main/java/com/segment/analytics/kotlin/android/plugins/AndroidContextPlugin.kt b/android/src/main/java/com/segment/analytics/kotlin/android/plugins/AndroidContextPlugin.kt
@@ -161,10 +161,8 @@ class AndroidContextPlugin : Plugin {
                 deviceId = task.await()
             }
 
-            if (deviceId != fallbackDeviceId) {
-                device = updateJsonObject(device) {
-                    it[DEVICE_ID_KEY] = deviceId
-                }
+            device = updateJsonObject(device) {
+                it[DEVICE_ID_KEY] = deviceId
             }
 
             storage.write(Storage.Constants.DeviceId, deviceId)
@@ -173,7 +171,7 @@ class AndroidContextPlugin : Plugin {
 
     internal fun getDeviceId(collectDeviceId: Boolean, fallbackDeviceId: String): String {
         if (!collectDeviceId) {
-            return storage.read(Storage.Constants.AnonymousId) ?: ""
+            return storage.read(Storage.Constants.AnonymousId) ?: fallbackDeviceId
         }
 
         // unique id generated from DRM API