fix: add missing functionality to the sessions after without merge

Author: arifBurakDemiray

sdk/src/main/java/ly/count/android/sdk/Countly.java

@@ -878,11 +878,11 @@ public synchronized void halt() {
         staticInit();
     }
 
-    synchronized void notifyDeviceIdChange() {
+    synchronized void notifyDeviceIdChange(boolean withoutMerge) {
         L.d("Notifying modules that device ID changed");
 
         for (ModuleBase module : modules) {
-            module.deviceIdChanged();
+            module.deviceIdChanged(withoutMerge);
         }
     }
 

sdk/src/main/java/ly/count/android/sdk/ModuleBase.java

@@ -88,7 +88,7 @@ void callbackOnActivityStopped(Activity activity) {
     //}
 
     //notify the SDK modules that the device ID has changed
-    void deviceIdChanged() {
+    void deviceIdChanged(boolean withoutMerge) {
     }
 
     //notify the SDK modules that consent was updated

sdk/src/main/java/ly/count/android/sdk/ModuleDeviceId.java

@@ -131,7 +131,10 @@ void changeDeviceIdWithoutMergeInternal(@NonNull String deviceId) {
         //update remote config_ values after id change if automatic update is enabled
         _cly.moduleRemoteConfig.clearAndDownloadAfterIdChange();
 
-        _cly.moduleSessions.endSessionInternal();
+        if (!_cly.moduleSessions.manualSessionControlEnabled) {
+            //if manual session control is not enabled, end the current session
+            _cly.moduleSessions.endSessionInternal(); // this will check consent
+        }
 
         //remove all consent
         _cly.moduleConsent.removeConsentAllInternal(ModuleConsent.ConsentChangeSource.DeviceIDChangedNotMerged);
@@ -146,7 +149,7 @@ void changeDeviceIdWithoutMergeInternal(@NonNull String deviceId) {
 
         //clear automated star rating session values because now we have a new user
         _cly.moduleRatings.clearAutomaticStarRatingSessionCountInternal();
-        _cly.notifyDeviceIdChange();
+        _cly.notifyDeviceIdChange(true);
     }
 
     /**
@@ -192,7 +195,7 @@ void changeDeviceIdWithMergeInternal(@NonNull String deviceId) {
             _cly.moduleRemoteConfig.clearAndDownloadAfterIdChange();
             requestQueueProvider.changeDeviceId(deviceId, deviceIdInstance.getCurrentId());
             deviceIdInstance.changeToCustomId(deviceId);
-            _cly.notifyDeviceIdChange();
+            _cly.notifyDeviceIdChange(false);
         }
     }
 

sdk/src/main/java/ly/count/android/sdk/ModuleRemoteConfig.java

@@ -433,7 +433,7 @@ void onConsentChanged(@NonNull final List<String> consentChangeDelta, final bool
     }
 
     @Override
-    void deviceIdChanged() {
+    void deviceIdChanged(boolean withoutMerge) {
         L.v("[RemoteConfig] Device ID changed will update values: [" + updateRemoteConfigAfterIdChange + "]");
 
         if (updateRemoteConfigAfterIdChange) {

sdk/src/main/java/ly/count/android/sdk/ModuleSessions.java

@@ -171,6 +171,14 @@ void halt() {
         sessionRunning = false;
     }
 
+    @Override
+    void deviceIdChanged(boolean withoutMerge) {
+        if (!manualSessionControlEnabled && withoutMerge) {
+            L.d("[ModuleSessions] deviceIdChanged, automatic session control enabled and device id changed without merge, starting a new session");
+            beginSessionInternal();
+        }
+    }
+
     public class Sessions {
         public void beginSession() {
             synchronized (_cly) {