refactor: spread out

Countly · Mar 22, 2024 · ab6235e · ab6235e
1 parent bdc468e
commit ab6235e
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleDeviceIdCore.java b/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleDeviceIdCore.java
@@ -206,14 +206,16 @@ private void setIDInternal(String newDeviceID) {
             return;
         }
 
-        // if current type is DEVELOPER_SUPPLIED
-        // an ID was provided by the host app previously
-        // we can assume that a device ID change with merge was executed previously
-        // now we change it without merging
-        // else
-        // SDK generated ID
-        // we change device ID with merge so that data is combined
-        changeDeviceIdInternal(newDeviceID, DeviceIdType.DEVELOPER_SUPPLIED, !getTypeInternal().equals(DeviceIdType.DEVELOPER_SUPPLIED));
+        if (getTypeInternal().equals(DeviceIdType.DEVELOPER_SUPPLIED)) {
+            // an ID was provided by the host app previously
+            // we can assume that a device ID change with merge was executed previously
+            // now we change it without merging
+            changeDeviceIdInternal(newDeviceID, DeviceIdType.DEVELOPER_SUPPLIED, false);
+        } else {
+            // SDK generated ID
+            // we change device ID with merge so that data is combined
+            changeDeviceIdInternal(newDeviceID, DeviceIdType.DEVELOPER_SUPPLIED, true);
+        }
     }
 
     @Override