Merge remote-tracking branch 'origin/connection-recovery-handler' into connection-recovery-handler

Author: aleksandar-apostolov

stream-android-core/src/main/java/io/getstream/android/core/api/utils/Result.kt

@@ -49,10 +49,13 @@ public inline fun <T, R> Result<T>.flatMap(transform: (T) -> Result<R>): Result<
 @StreamInternalApi
 public suspend fun <T> Result<T>.onTokenError(
     function: suspend (exception: StreamEndpointException, code: Int) -> Result<T>
-): Result<T> = onFailure {
-    if (it is StreamEndpointException && it.apiError?.code?.div(10) == 4) {
-        function(it, it.apiError.code)
-    } else {
-        this
+): Result<T> = fold(
+    onSuccess = { this },
+    onFailure = { throwable ->
+        if (throwable is StreamEndpointException && throwable.apiError?.code?.div(10) == 4) {
+            function(throwable, throwable.apiError.code)
+        } else {
+            this
+        }
     }
-}
+)

stream-android-core/src/main/java/io/getstream/android/core/internal/observers/StreamNetworkAndLifeCycleMonitor.kt

@@ -31,9 +31,9 @@ import kotlinx.coroutines.flow.MutableStateFlow
  * Coordinates lifecycle and network signals to make connection recovery decisions.
  *
  * ### Responsibilities
- * - Bridges callbacks from [StreamNetworkMonitor] and [StreamLifecycleMonitor] into hot state flows
- *   exposed as [networkState] and [lifecycleState].
- * - Notifies registered [StreamConnectionRecoveryListener]s when reconnect/teardown actions should
+ * - Bridges callbacks from [StreamNetworkMonitor] and [StreamLifecycleMonitor] into internal state flows
+ *   for network and lifecycle state.
+ * - Notifies registered [StreamNetworkAndLifecycleMonitorListener]s when reconnect/teardown actions should
  *   occur.
  * - Implements [StreamStartableComponent] so callers can hook into their own lifecycle.
  *

stream-android-core/src/main/java/io/getstream/android/core/internal/recovery/StreamConnectionRecoveryEvaluatorImpl.kt

@@ -94,9 +94,7 @@ internal class StreamConnectionRecoveryEvaluatorImpl(
             lastConnectionState = connectionState
             lastLifecycleState = lifecycleState
             lastNetworkState = networkState
-            if (networkState is StreamNetworkState.Available) {
-                lastNetworkSnapshot = networkState.snapshot
-            }
+            lastNetworkSnapshot = connectSnapshot
             result
         }
 }