fix device id empty (#183)

wenxi-zeng · web-flow · commit 3abff0d3d946 · 2023-09-26T10:07:50.000-07:00
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

Original file line number	Diff line number	Diff line change
`@@ -161,10 +161,8 @@ class AndroidContextPlugin : Plugin {`
`161`	`161`	`deviceId = task.await()`
`162`	`162`	`}`
`163`	`163`
`164`		`- if (deviceId != fallbackDeviceId) {`
`165`		`- device = updateJsonObject(device) {`
`166`		`- it[DEVICE_ID_KEY] = deviceId`
`167`		`- }`
	`164`	`+ device = updateJsonObject(device) {`
	`165`	`+ it[DEVICE_ID_KEY] = deviceId`
`168`	`166`	`}`
`169`	`167`
`170`	`168`	`storage.write(Storage.Constants.DeviceId, deviceId)`
`@@ -173,7 +171,7 @@ class AndroidContextPlugin : Plugin {`
`173`	`171`
`174`	`172`	`internal fun getDeviceId(collectDeviceId: Boolean, fallbackDeviceId: String): String {`
`175`	`173`	`if (!collectDeviceId) {`
`176`		`- return storage.read(Storage.Constants.AnonymousId) ?: ""`
	`174`	`+ return storage.read(Storage.Constants.AnonymousId) ?: fallbackDeviceId`
`177`	`175`	`}`
`178`	`176`
`179`	`177`	`// unique id generated from DRM API`