Merge branch 'feat/real-time-location' into feat/location-core-types

Shahroz16 · Shahroz16 · commit 210202660f5b · 2026-02-16T23:08:15.000+05:00
# Conflicts:
#	core/api/core.api
diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml
@@ -52,7 +52,7 @@ jobs:
           body: |
             Build available to test
             Version: `${{ steps.set-snapshot-version.outputs.VERSION }}`
-            Repository: `https://s01.oss.sonatype.org/content/repositories/snapshots/`
+            Repository: `https://central.sonatype.com/repository/maven-snapshots/`
           edit-mode: replace
           token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [4.15.1](https://github.com/customerio/customerio-android/compare/4.15.0...4.15.1) (2026-02-04)
+
+### Bug Fixes
+
+* In app improvements ([#640](https://github.com/customerio/customerio-android/issues/640)) ([2270377](https://github.com/customerio/customerio-android/commit/22703777fa43d091600e93a873908b2538185f7e))
+
 ## [4.15.0](https://github.com/customerio/customerio-android/compare/4.14.0...4.15.0) (2026-01-13)
 
 ### Features
diff --git a/core/api/core.api b/core/api/core.api
@@ -12,17 +12,6 @@ public abstract class io/customer/sdk/communication/Event {
 	public fun getTimestamp ()Ljava/util/Date;
 }
 
-public final class io/customer/sdk/communication/Event$AnonymousIdGeneratedEvent : io/customer/sdk/communication/Event {
-	public fun <init> (Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;)Lio/customer/sdk/communication/Event$AnonymousIdGeneratedEvent;
-	public static synthetic fun copy$default (Lio/customer/sdk/communication/Event$AnonymousIdGeneratedEvent;Ljava/lang/String;ILjava/lang/Object;)Lio/customer/sdk/communication/Event$AnonymousIdGeneratedEvent;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAnonymousId ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class io/customer/sdk/communication/Event$DeleteDeviceTokenEvent : io/customer/sdk/communication/Event {
 	public fun <init> ()V
 }
@@ -40,17 +29,6 @@ public final class io/customer/sdk/communication/Event$LocationData {
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class io/customer/sdk/communication/Event$ProfileIdentifiedEvent : io/customer/sdk/communication/Event {
-	public fun <init> (Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;)Lio/customer/sdk/communication/Event$ProfileIdentifiedEvent;
-	public static synthetic fun copy$default (Lio/customer/sdk/communication/Event$ProfileIdentifiedEvent;Ljava/lang/String;ILjava/lang/Object;)Lio/customer/sdk/communication/Event$ProfileIdentifiedEvent;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getIdentifier ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class io/customer/sdk/communication/Event$RegisterDeviceTokenEvent : io/customer/sdk/communication/Event {
 	public fun <init> (Ljava/lang/String;)V
 	public final fun component1 ()Ljava/lang/String;
@@ -119,6 +97,19 @@ public final class io/customer/sdk/communication/Event$TrackPushMetricEvent : io
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class io/customer/sdk/communication/Event$UserChangedEvent : io/customer/sdk/communication/Event {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lio/customer/sdk/communication/Event$UserChangedEvent;
+	public static synthetic fun copy$default (Lio/customer/sdk/communication/Event$UserChangedEvent;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lio/customer/sdk/communication/Event$UserChangedEvent;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAnonymousId ()Ljava/lang/String;
+	public final fun getUserId ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public abstract interface class io/customer/sdk/communication/EventBus {
 	public abstract fun getFlow ()Lkotlinx/coroutines/flow/SharedFlow;
 	public abstract fun publish (Lio/customer/sdk/communication/Event;)V
diff --git a/core/src/main/kotlin/io/customer/sdk/Version.kt b/core/src/main/kotlin/io/customer/sdk/Version.kt
@@ -7,5 +7,5 @@ package io.customer.sdk
 
 // TODO: Check before final release if we still need to keep Version class public or can be internal
 object Version {
-    const val version: String = "4.15.0"
+    const val version: String = "4.15.1"
 }
diff --git a/core/src/main/kotlin/io/customer/sdk/communication/Event.kt b/core/src/main/kotlin/io/customer/sdk/communication/Event.kt
@@ -17,11 +17,14 @@ sealed class Event {
     // Timestamp of the event
     open val timestamp: Date = Date()
 
-    data class ProfileIdentifiedEvent(
-        val identifier: String
-    ) : Event()
-
-    data class AnonymousIdGeneratedEvent(
+    /**
+     * Event published when user identity changes (identify or clearIdentify).
+     *
+     * @param userId The user ID if identified, null if anonymous
+     * @param anonymousId The anonymous ID (always present)
+     */
+    data class UserChangedEvent(
+        val userId: String?,
         val anonymousId: String
     ) : Event()
 
diff --git a/core/src/test/java/io/customer/sdk/communication/EventBusTest.kt b/core/src/test/java/io/customer/sdk/communication/EventBusTest.kt
@@ -44,19 +44,22 @@ class EventBusTest : JUnit5Test() {
     @Test
     fun givenPublishEventVerifySubscribe() = runBlocking {
         val events = mutableListOf<Event>()
-        val job = eventBus.subscribe<Event.ProfileIdentifiedEvent> { event ->
+        val job = eventBus.subscribe<Event.UserChangedEvent> { event ->
             events.add(event)
         }
 
-        val testEvent = Event.ProfileIdentifiedEvent("Test Message")
+        val testEvent = Event.UserChangedEvent(userId = "testUserId", anonymousId = "testAnonymousId")
         println("Publishing event: $testEvent")
         eventBus.publish(testEvent)
 
         yield() // Allow event processing
 
         events.shouldHaveSingleItem()
-            .shouldBeInstanceOf<Event.ProfileIdentifiedEvent>()
-            .identifier shouldBeEqualTo testEvent.identifier
+            .shouldBeInstanceOf<Event.UserChangedEvent>()
+            .also {
+                it.userId shouldBeEqualTo testEvent.userId
+                it.anonymousId shouldBeEqualTo testEvent.anonymousId
+            }
 
         job.cancel()
     }
diff --git a/datapipelines/src/main/kotlin/io/customer/sdk/CustomerIO.kt b/datapipelines/src/main/kotlin/io/customer/sdk/CustomerIO.kt
@@ -137,14 +137,8 @@ class CustomerIO private constructor(
 
     private fun postUserIdentificationEvents() {
         val userId = analytics.userId()
-        if (userId != null) {
-            eventBus.publish(Event.ProfileIdentifiedEvent(identifier = userId))
-        } else {
-            val anonymousId = analytics.anonymousId()
-            if (anonymousId.isNotBlank()) {
-                eventBus.publish(Event.AnonymousIdGeneratedEvent(anonymousId = anonymousId))
-            }
-        }
+        val anonymousId = analytics.anonymousId()
+        eventBus.publish(Event.UserChangedEvent(userId = userId, anonymousId = anonymousId))
     }
 
     private fun subscribeToJourneyEvents() {
@@ -264,7 +258,7 @@ class CustomerIO private constructor(
 
         logger.info("identify profile with identifier $userId and traits $traits")
         // publish event to EventBus for other modules to consume
-        eventBus.publish(Event.ProfileIdentifiedEvent(identifier = userId))
+        eventBus.publish(Event.UserChangedEvent(userId = userId, anonymousId = analytics.anonymousId()))
         analytics.identify(
             userId = userId,
             traits = traits,
@@ -322,6 +316,9 @@ class CustomerIO private constructor(
         // publish event to EventBus for other modules to consume
         eventBus.publish(Event.ResetEvent)
         analytics.reset()
+
+        val newAnonymousId = analytics.anonymousId()
+        eventBus.publish(Event.UserChangedEvent(userId = null, anonymousId = newAnonymousId))
     }
 
     override val registeredDeviceToken: String?
diff --git a/location/src/main/kotlin/io/customer/location/provider/LocationProvider.kt b/location/src/main/kotlin/io/customer/location/provider/LocationProvider.kt
@@ -21,12 +21,6 @@ internal interface LocationProvider {
      */
     suspend fun requestLocation(granularity: LocationGranularity): LocationSnapshot
 
-    /**
-     * Cancels any in-flight location request. Idempotent - safe to call
-     * even when no request is in progress.
-     */
-    suspend fun cancelRequestLocation()
-
     /**
      * Current authorization state for location access.
      * Used for pre-checks before requesting location.
diff --git a/messaginginapp/src/main/java/io/customer/messaginginapp/ModuleMessagingInApp.kt b/messaginginapp/src/main/java/io/customer/messaginginapp/ModuleMessagingInApp.kt
@@ -48,13 +48,18 @@ class ModuleMessagingInApp(
             gistProvider.setCurrentRoute(it.name)
         }
 
-        eventBus.subscribe<Event.ProfileIdentifiedEvent> {
-            gistProvider.setUserId(it.identifier)
-        }
+        eventBus.subscribe<Event.UserChangedEvent> { event ->
+            val userId = event.userId
+            logger.debug("User changed: userId=$userId, anonymousId=${event.anonymousId}")
+
+            gistProvider.setAnonymousId(event.anonymousId)
+            setCustomAttribute("cio_anonymous_id", event.anonymousId)
+
+            if (userId != null) {
+                gistProvider.setUserId(userId)
+            }
 
-        eventBus.subscribe<Event.AnonymousIdGeneratedEvent> {
-            gistProvider.setAnonymousId(it.anonymousId)
-            setCustomAttribute("cio_anonymous_id", it.anonymousId)
+            gistProvider.fetchInAppMessages()
         }
 
         eventBus.subscribe<Event.ResetEvent> {
diff --git a/messaginginapp/src/main/java/io/customer/messaginginapp/gist/presentation/GistSdk.kt b/messaginginapp/src/main/java/io/customer/messaginginapp/gist/presentation/GistSdk.kt
@@ -125,7 +125,8 @@ internal class GistSdk(
             fetchInAppMessages(duration = interval, initialDelay = interval)
         }
 
-        // Subscribe to SSE flag changes
+        // Subscribe to SSE flag changes - only manage timer state, not triggering fetches
+        // Fetches are controlled by ModuleMessagingInApp event handlers and onActivityResumed()
         inAppMessagingManager.subscribeToAttribute({ it.sseEnabled }) { _ ->
             // Only manage polling when app is foregrounded
             if (!isAppForegrounded) {
@@ -137,14 +138,12 @@ internal class GistSdk(
                 // SSE is now active - stop polling
                 logger.debug("SSE enabled for identified user, stopping polling")
                 resetTimer()
-            } else {
-                // SSE not active - start polling
-                logger.debug("SSE not active, starting polling")
-                fetchInAppMessages(state.pollInterval)
             }
+            // Note: Starting polling is handled by onActivityResumed() or event handlers
         }
 
-        // Subscribe to user identification changes
+        // Subscribe to user identification changes - only manage timer state, not triggering fetches
+        // Fetches are controlled by ModuleMessagingInApp event handlers and onActivityResumed()
         inAppMessagingManager.subscribeToAttribute({ it.isUserIdentified }) { _ ->
             // Only manage polling when app is foregrounded
             if (!isAppForegrounded) {
@@ -156,11 +155,8 @@ internal class GistSdk(
                 // SSE is now active - stop polling
                 logger.debug("User identified with SSE enabled, stopping polling")
                 resetTimer()
-            } else {
-                // SSE not active - start polling
-                logger.debug("SSE not active, starting polling")
-                fetchInAppMessages(state.pollInterval)
             }
+            // Note: Starting polling is handled by onActivityResumed() or event handlers
         }
     }
 
@@ -178,7 +174,7 @@ internal class GistSdk(
             return
         }
         inAppMessagingManager.dispatch(InAppMessagingAction.SetUserIdentifier(userId))
-        fetchInAppMessages(state.pollInterval)
+        // Note: fetch is now controlled by the event handler, not here
     }
 
     override fun setAnonymousId(anonymousId: String) {
@@ -188,7 +184,7 @@ internal class GistSdk(
         }
         logger.debug("Setting anonymous id to: $anonymousId")
         inAppMessagingManager.dispatch(InAppMessagingAction.SetAnonymousIdentifier(anonymousId))
-        fetchInAppMessages(state.pollInterval)
+        // Note: fetch is now controlled by the event handler, not here
     }
 
     override fun dismissMessage() {
diff --git a/messaginginapp/src/main/java/io/customer/messaginginapp/gist/presentation/engine/EngineWebView.kt b/messaginginapp/src/main/java/io/customer/messaginginapp/gist/presentation/engine/EngineWebView.kt
@@ -69,6 +69,12 @@ internal class EngineWebView @JvmOverloads constructor(
     fun onLifecycleResumed() {
         logger.info("EngineWebView onLifecycleResumed")
         webView?.let { engineWebViewInterface.attach(webView = it) }
+        // If timerTask exists but timer doesn't, we were paused mid-load
+        // Restart the timer with a fresh timeout duration
+        if (timerTask != null && timer == null) {
+            logger.debug("Resuming timeout timer after lifecycle resume")
+            setupTimeout()
+        }
     }
 
     override fun onPause(owner: LifecycleOwner) {
@@ -79,6 +85,7 @@ internal class EngineWebView @JvmOverloads constructor(
     fun onLifecyclePaused() {
         logger.info("EngineWebView onLifecyclePaused")
         webView?.let { engineWebViewInterface.detach(webView = it) }
+        pauseTimer()
     }
 
     /**
@@ -217,16 +224,33 @@ internal class EngineWebView @JvmOverloads constructor(
                 if (timer != null) {
                     logger.debug("Message global timeout, cancelling display.")
                     listener?.error()
-                    stopTimer()
+                    cleanupTimer()
                 }
             }
         }
         timer = Timer()
-        timer?.schedule(timerTask, 5000)
+        timer?.schedule(timerTask, TIMEOUT_DURATION)
+    }
+
+    /**
+     * Pauses the timeout timer when the app goes to background.
+     * Cancels the timer but keeps timerTask as a signal that we need to restart on resume.
+     */
+    private fun pauseTimer() {
+        if (timer == null) return
+        logger.debug("Pausing timeout timer")
+        timer?.cancel()
+        timer?.purge()
+        timer = null
+        // Note: timerTask remains non-null as signal that we need to restart on resume
+    }
+
+    companion object {
+        private const val TIMEOUT_DURATION = 5000L
     }
 
     override fun bootstrapped() {
-        stopTimer()
+        cleanupTimer()
         listener?.bootstrapped()
     }
 
@@ -256,8 +280,14 @@ internal class EngineWebView @JvmOverloads constructor(
         listener?.error()
     }
 
-    private fun stopTimer() {
+    /**
+     * Fully cleans up the timeout timer.
+     * Called when loading completes (success or timeout).
+     * Nulls out both timer and timerTask to indicate we're no longer waiting for load.
+     */
+    private fun cleanupTimer() {
         timerTask?.cancel()
+        timerTask = null
         timer?.cancel()
         timer?.purge()
         timer = null
diff --git a/messaginginapp/src/test/java/io/customer/messaginginapp/GistSDKTest.kt b/messaginginapp/src/test/java/io/customer/messaginginapp/GistSDKTest.kt
@@ -84,14 +84,14 @@ class GistSDKTest : JUnitTest() {
     }
 
     @Test
-    fun setUserId_givenNewUserId_expectSetUserIdentifierActionDispatchedAndMessagesFetched() = runTest {
+    fun setUserId_givenNewUserId_expectSetUserIdentifierActionDispatchedWithoutFetch() = runTest {
         val givenUserId = String.random
 
         gistSdk.setUserId(givenUserId)
 
         assertCalledOnce { mockInAppMessagingManager.dispatch(InAppMessagingAction.SetUserIdentifier(givenUserId)) }
-        // fetchUserMessages() is called in a timer with initialDelay=0, so we use timeout
-        verify(timeout = 1000, exactly = 1) { mockGistQueue.fetchUserMessages() }
+        // fetch is now controlled by event handler, not setUserId
+        verify(exactly = 0) { mockGistQueue.fetchUserMessages() }
     }
 
     @Test
@@ -132,9 +132,8 @@ class GistSDKTest : JUnitTest() {
 
         gistSdk.setUserId(givenUserId)
 
-        // verify first call actions (use timeout for async timer)
+        // verify first call dispatches the action
         verify(exactly = 1) { mockInAppMessagingManager.dispatch(InAppMessagingAction.SetUserIdentifier(givenUserId)) }
-        verify(timeout = 1000, exactly = 1) { mockGistQueue.fetchUserMessages() }
 
         // clear invocations to start fresh for the second call
         clearMocks(mockInAppMessagingManager, mockGistQueue)
@@ -145,13 +144,10 @@ class GistSDKTest : JUnitTest() {
         // second call with the same user ID
         gistSdk.setUserId(givenUserId)
 
-        // verify no additional actions on second call
+        // verify no additional actions on second call (state unchanged)
         verify(exactly = 0) {
             mockInAppMessagingManager.dispatch(any<InAppMessagingAction.SetUserIdentifier>())
         }
-        verify(exactly = 0) {
-            mockGistQueue.fetchUserMessages()
-        }
     }
 
     // Tests for persistent messages
diff --git a/messaginginapp/src/test/java/io/customer/messaginginapp/ModuleMessagingInAppTest.kt b/messaginginapp/src/test/java/io/customer/messaginginapp/ModuleMessagingInAppTest.kt

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ package io.customer.sdk`
`7`	`7`
`8`	`8`	`// TODO: Check before final release if we still need to keep Version class public or can be internal`
`9`	`9`	`object Version {`
`10`		`- const val version: String = "4.15.0"`
	`10`	`+ const val version: String = "4.15.1"`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,8 @@ internal class GistSdk(`
`125`	`125`	`fetchInAppMessages(duration = interval, initialDelay = interval)`
`126`	`126`	`}`
`127`	`127`
`128`		`- // Subscribe to SSE flag changes`
	`128`	`+ // Subscribe to SSE flag changes - only manage timer state, not triggering fetches`
	`129`	`+ // Fetches are controlled by ModuleMessagingInApp event handlers and onActivityResumed()`
`129`	`130`	`inAppMessagingManager.subscribeToAttribute({ it.sseEnabled }) { _ ->`
`130`	`131`	`// Only manage polling when app is foregrounded`
`131`	`132`	`if (!isAppForegrounded) {`
`@@ -137,14 +138,12 @@ internal class GistSdk(`
`137`	`138`	`// SSE is now active - stop polling`
`138`	`139`	`logger.debug("SSE enabled for identified user, stopping polling")`
`139`	`140`	`resetTimer()`
`140`		`- } else {`
`141`		`- // SSE not active - start polling`
`142`		`- logger.debug("SSE not active, starting polling")`
`143`		`- fetchInAppMessages(state.pollInterval)`
`144`	`141`	`}`
	`142`	`+ // Note: Starting polling is handled by onActivityResumed() or event handlers`
`145`	`143`	`}`
`146`	`144`
`147`		`- // Subscribe to user identification changes`
	`145`	`+ // Subscribe to user identification changes - only manage timer state, not triggering fetches`
	`146`	`+ // Fetches are controlled by ModuleMessagingInApp event handlers and onActivityResumed()`
`148`	`147`	`inAppMessagingManager.subscribeToAttribute({ it.isUserIdentified }) { _ ->`
`149`	`148`	`// Only manage polling when app is foregrounded`
`150`	`149`	`if (!isAppForegrounded) {`
`@@ -156,11 +155,8 @@ internal class GistSdk(`
`156`	`155`	`// SSE is now active - stop polling`
`157`	`156`	`logger.debug("User identified with SSE enabled, stopping polling")`
`158`	`157`	`resetTimer()`
`159`		`- } else {`
`160`		`- // SSE not active - start polling`
`161`		`- logger.debug("SSE not active, starting polling")`
`162`		`- fetchInAppMessages(state.pollInterval)`
`163`	`158`	`}`
	`159`	`+ // Note: Starting polling is handled by onActivityResumed() or event handlers`
`164`	`160`	`}`
`165`	`161`	`}`
`166`	`162`
`@@ -178,7 +174,7 @@ internal class GistSdk(`
`178`	`174`	`return`
`179`	`175`	`}`
`180`	`176`	`inAppMessagingManager.dispatch(InAppMessagingAction.SetUserIdentifier(userId))`
`181`		`- fetchInAppMessages(state.pollInterval)`
	`177`	`+ // Note: fetch is now controlled by the event handler, not here`
`182`	`178`	`}`
`183`	`179`
`184`	`180`	`override fun setAnonymousId(anonymousId: String) {`
`@@ -188,7 +184,7 @@ internal class GistSdk(`
`188`	`184`	`}`
`189`	`185`	`logger.debug("Setting anonymous id to: $anonymousId")`
`190`	`186`	`inAppMessagingManager.dispatch(InAppMessagingAction.SetAnonymousIdentifier(anonymousId))`
`191`		`- fetchInAppMessages(state.pollInterval)`
	`187`	`+ // Note: fetch is now controlled by the event handler, not here`
`192`	`188`	`}`
`193`	`189`
`194`	`190`	`override fun dismissMessage() {`