Let UserManager refresh timezone changes on focus

Let the UserManager refresh the changes to properties model, instead of SessionListener. The SubscriptionManager already refreshes the push subscription.

Author: nan-li

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/impl/SessionListener.kt

@@ -11,7 +11,6 @@ import com.onesignal.session.internal.session.ISessionService
 import com.onesignal.user.internal.identity.IdentityModelStore
 import com.onesignal.user.internal.operations.TrackSessionEndOperation
 import com.onesignal.user.internal.operations.TrackSessionStartOperation
-import com.onesignal.user.internal.properties.PropertiesModelStore
 
 /**
  * The [SessionListener] is responsible for subscribing itself as an [ISessionLifecycleHandler]
@@ -34,16 +33,13 @@ internal class SessionListener(
     private val _sessionService: ISessionService,
     private val _configModelStore: ConfigModelStore,
     private val _identityModelStore: IdentityModelStore,
-    private val _propertiesModelStore: PropertiesModelStore,
     private val _outcomeEventsController: IOutcomeEventsController,
 ) : IStartableService, ISessionLifecycleHandler {
     override fun start() {
         _sessionService.subscribe(this)
     }
 
     override fun onSessionStarted() {
-        // Detect any user updates to send with the TrackSessionStartOperation
-        _propertiesModelStore.model.update()
         _operationRepo.enqueue(TrackSessionStartOperation(_configModelStore.model.appId, _identityModelStore.model.onesignalId), true)
     }
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt

@@ -2,9 +2,12 @@ package com.onesignal.user.internal
 
 import com.onesignal.common.IDManager
 import com.onesignal.common.OneSignalUtils
+import com.onesignal.common.TimeUtils
 import com.onesignal.common.events.EventProducer
 import com.onesignal.common.modeling.ISingletonModelStoreChangeHandler
 import com.onesignal.common.modeling.ModelChangedArgs
+import com.onesignal.core.internal.application.IApplicationLifecycleHandler
+import com.onesignal.core.internal.application.IApplicationService
 import com.onesignal.core.internal.language.ILanguageContext
 import com.onesignal.debug.LogLevel
 import com.onesignal.debug.internal.logging.Logging
@@ -26,7 +29,8 @@ internal open class UserManager(
     private val _identityModelStore: IdentityModelStore,
     private val _propertiesModelStore: PropertiesModelStore,
     private val _languageContext: ILanguageContext,
-) : IUserManager, ISingletonModelStoreChangeHandler<IdentityModel> {
+    private val _applicationService: IApplicationService,
+) : IUserManager, IApplicationLifecycleHandler, ISingletonModelStoreChangeHandler<IdentityModel> {
     override val onesignalId: String
         get() = if (IDManager.isLocalId(_identityModel.onesignalId)) "" else _identityModel.onesignalId
 
@@ -55,6 +59,7 @@ internal open class UserManager(
     }
 
     init {
+        _applicationService.addApplicationLifecycleHandler(this)
         _identityModelStore.subscribe(this)
     }
 
@@ -260,4 +265,11 @@ internal open class UserManager(
             }
         }
     }
+
+    override fun onFocus(firedOnSubscribe: Boolean) {
+        // Detect any user properties updates that changed
+        _propertiesModel.timezone = TimeUtils.getTimeZoneId()
+    }
+
+    override fun onUnfocused() { }
 }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/RefreshUserOperationExecutor.kt

@@ -1,6 +1,7 @@
 package com.onesignal.user.internal.operations.impl.executors
 
 import com.onesignal.common.NetworkUtils
+import com.onesignal.common.TimeUtils
 import com.onesignal.common.exceptions.BackendException
 import com.onesignal.common.modeling.ModelChangeTags
 import com.onesignal.core.internal.config.ConfigModelStore
@@ -90,7 +91,7 @@ internal class RefreshUserOperationExecutor(
             }
 
             // No longer hydrate timezone from remote, set locally
-            propertiesModel.update()
+            propertiesModel.timezone = TimeUtils.getTimeZoneId()
 
             val subscriptionModels = mutableListOf<SubscriptionModel>()
             for (subscription in response.subscriptions) {

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/properties/PropertiesModel.kt

@@ -1,6 +1,5 @@
 package com.onesignal.user.internal.properties
 
-import com.onesignal.common.TimeUtils
 import com.onesignal.common.modeling.MapModel
 import com.onesignal.common.modeling.Model
 import org.json.JSONObject
@@ -123,8 +122,4 @@ class PropertiesModel : Model() {
 
         return null
     }
-
-    fun update() {
-        timezone = TimeUtils.getTimeZoneId()
-    }
 }