Feat: Detect for timezone changes and update the user

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/LoginUserOperationExecutor.kt

@@ -146,7 +146,7 @@ internal class LoginUserOperationExecutor(
         var identities = mapOf<String, String>()
         var subscriptions = mapOf<String, SubscriptionObject>()
         val properties = mutableMapOf<String, String>()
-        properties["timezone_id"] = TimeUtils.getTimeZoneId()!!
+        properties["timezone_id"] = TimeUtils.getTimeZoneId()
         properties["language"] = _languageContext.language
 
         if (createUserOperation.externalId != null) {

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
@@ -89,9 +90,8 @@ internal class RefreshUserOperationExecutor(
                 }
             }
 
-            if (response.properties.timezoneId != null) {
-                propertiesModel.timezone = response.properties.timezoneId
-            }
+            // No longer hydrate timezone from remote, set locally
+            propertiesModel.timezone = TimeUtils.getTimeZoneId()
 
             val subscriptionModels = mutableListOf<SubscriptionModel>()
             for (subscription in response.subscriptions) {

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/common/TimeUtilsTest.kt

@@ -0,0 +1,48 @@
+package com.onesignal.common
+
+import android.os.Build
+import br.com.colman.kotest.android.extensions.robolectric.RobolectricTest
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNotBe
+import io.kotest.matchers.string.shouldNotBeEmpty
+import io.kotest.matchers.string.shouldNotContain
+import java.time.ZoneId
+import java.util.TimeZone
+
+@RobolectricTest
+class TimeUtilsTest : FunSpec({
+
+    test("getTimeZoneId returns correct time zone id") {
+        // Given
+        val expected =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                ZoneId.systemDefault().id
+            } else {
+                TimeZone.getDefault().id
+            }
+
+        // When
+        val actual = TimeUtils.getTimeZoneId()
+
+        // Then
+        actual shouldBe expected
+        actual.shouldNotBeEmpty()
+    }
+
+    test("getTimeZoneId returns valid timezone format") {
+        // When
+        val timeZoneId = TimeUtils.getTimeZoneId()
+
+        // Then
+        timeZoneId.shouldNotBeEmpty()
+        timeZoneId shouldNotBe ""
+
+        // Valid timezone IDs follow IANA format patterns:
+        // - Continental zones: "America/New_York", "Europe/London"
+        // - UTC variants: "UTC", "GMT"
+        // - Offset formats: "GMT+05:30", "UTC-08:00"
+        // Should not contain spaces or invalid characters
+        timeZoneId.shouldNotContain(" ")
+    }
+})

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt

@@ -1,5 +1,6 @@
 package com.onesignal.user.internal
 
+import com.onesignal.common.TimeUtils
 import com.onesignal.core.internal.language.ILanguageContext
 import com.onesignal.mocks.MockHelper
 import com.onesignal.user.internal.subscriptions.ISubscriptionManager
@@ -10,8 +11,10 @@ import io.kotest.matchers.shouldNotBe
 import io.mockk.every
 import io.mockk.just
 import io.mockk.mockk
+import io.mockk.mockkObject
 import io.mockk.runs
 import io.mockk.slot
+import io.mockk.unmockkObject
 import io.mockk.verify
 
 class UserManagerTests : FunSpec({
@@ -26,7 +29,7 @@ class UserManagerTests : FunSpec({
         every { languageContext.language = capture(languageSlot) } answers { }
 
         val userManager =
-            UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), MockHelper.propertiesModelStore(), languageContext)
+            UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), MockHelper.propertiesModelStore(), languageContext, MockHelper.applicationService())
 
         // When
         userManager.setLanguage("new-language")
@@ -44,7 +47,7 @@ class UserManagerTests : FunSpec({
             }
 
         val userManager =
-            UserManager(mockSubscriptionManager, identityModelStore, MockHelper.propertiesModelStore(), MockHelper.languageContext())
+            UserManager(mockSubscriptionManager, identityModelStore, MockHelper.propertiesModelStore(), MockHelper.languageContext(), MockHelper.applicationService())
 
         // When
         val externalId = userManager.externalId
@@ -63,7 +66,7 @@ class UserManagerTests : FunSpec({
             }
 
         val userManager =
-            UserManager(mockSubscriptionManager, identityModelStore, MockHelper.propertiesModelStore(), MockHelper.languageContext())
+            UserManager(mockSubscriptionManager, identityModelStore, MockHelper.propertiesModelStore(), MockHelper.languageContext(), MockHelper.applicationService())
 
         // When
         val alias1 = userManager.aliases["my-alias-key1"]
@@ -102,7 +105,7 @@ class UserManagerTests : FunSpec({
             }
 
         val userManager =
-            UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext())
+            UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext(), MockHelper.applicationService())
 
         // When
         val tag1 = propertiesModelStore.model.tags["my-tag-key1"]
@@ -141,7 +144,7 @@ class UserManagerTests : FunSpec({
                 it.tags["my-tag-key1"] = "my-tag-value1"
             }
 
-        val userManager = UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext())
+        val userManager = UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext(), MockHelper.applicationService())
 
         // When
         val tagSnapshot1 = userManager.getTags()
@@ -174,6 +177,7 @@ class UserManagerTests : FunSpec({
                 MockHelper.identityModelStore(),
                 MockHelper.propertiesModelStore(),
                 MockHelper.languageContext(),
+                MockHelper.applicationService(),
             )
 
         // When
@@ -191,4 +195,36 @@ class UserManagerTests : FunSpec({
         verify(exactly = 1) { mockSubscriptionManager.addSmsSubscription("+15558675309") }
         verify(exactly = 1) { mockSubscriptionManager.removeSmsSubscription("+15558675309") }
     }
+
+    test("onFocus updates timezone") {
+        // Given
+        val mockTimeZone = "Europe/Foo"
+        mockkObject(TimeUtils)
+        every { TimeUtils.getTimeZoneId() } returns mockTimeZone
+
+        val mockPropertiesModelStore = MockHelper.propertiesModelStore()
+
+        val userManager =
+            UserManager(
+                mockk<ISubscriptionManager>(),
+                MockHelper.identityModelStore(),
+                mockPropertiesModelStore,
+                MockHelper.languageContext(),
+                MockHelper.applicationService(),
+            )
+
+        val propertiesModel = mockPropertiesModelStore.model
+        propertiesModel.timezone shouldNotBe mockTimeZone
+
+        try {
+            // When
+            userManager.onFocus(firedOnSubscribe = false)
+
+            // Then
+            propertiesModel.timezone shouldBe mockTimeZone
+        } finally {
+            // Clean up the mock
+            unmockkObject(TimeUtils)
+        }
+    }
 })