Merge remote-tracking branch 'remotes/origin/master' into feat/rename-presonalizatio-module

Author: xeewii

personalization-sdk/build.gradle

@@ -6,7 +6,7 @@ plugins {
 	id 'kotlin-kapt'
 }
 
-version='2.0.16'
+version='2.0.17'
 
 android {
 	compileSdkVersion 34

personalization-sdk/src/main/kotlin/com/personalization/RegisterManager.kt

@@ -50,7 +50,7 @@ class RegisterManager @Inject constructor(
         this.contentResolver = contentResolver
         this.autoSendPushToken = autoSendPushToken
 
-        if (did != null) return
+        if (!did.isNullOrEmpty()) return
 
         did = getPreferencesValueUseCase.getDid()
 
@@ -84,11 +84,11 @@ class RegisterManager @Inject constructor(
 
             val currentDate = Date()
 
-            if (tokenField.isEmpty()
+            if(autoSendPushToken &&
+                (tokenField.isEmpty()
                 || tokenField != token
-                || (currentDate.time - getPreferencesValueUseCase.getLastPushTokenDate()) >= ONE_WEEK_MILLISECONDS
+                || (currentDate.time - getPreferencesValueUseCase.getLastPushTokenDate()) >= ONE_WEEK_MILLISECONDS)
             ) {
-
                 setPushTokenNotification(token, object : OnApiCallbackListener() {
                     override fun onSuccess(response: JSONObject?) {
                         savePreferencesValueUseCase.saveLastPushTokenDate(currentDate.time)
@@ -164,11 +164,11 @@ class RegisterManager @Inject constructor(
         //To do this, it is enough to track the time of the last action for the session and, if it is more than N hours, then create a new session.
 
         if (seance == null) {
-            val sid = getPreferencesValueUseCase.getSid()
-            if(sid.isEmpty()
+            val newSid = getPreferencesValueUseCase.getSid()
+            if(newSid.isNotEmpty()
                 && getPreferencesValueUseCase.getSidLastActTime() >= System.currentTimeMillis() - SESSION_CODE_EXPIRE * 3600 * 1000)
             {
-                seance = sid
+                seance = newSid
             }
         }