Fix network callback and lifecycle observer not being unregistered during disconnect (#6125)

* Fix network callback and lifecycle observer not being unregistered during disconnect

Co-Authored-By: Claude <noreply@anthropic.com>

* Update CHANGELOG

Co-Authored-By: Claude <noreply@anthropic.com>

* Refactor code

* Fix LogTag

---------

Co-authored-by: Claude <noreply@anthropic.com>

Author: VelikovPetar

CHANGELOG.md

@@ -13,8 +13,10 @@
 ## stream-chat-android-client
 ### 🐞 Fixed
 - Fix race condition crash when accessing `globalState` during disconnect. [#6122](https://github.com/GetStream/stream-chat-android/pull/6122)
+- Fix network callback and lifecycle observer not being unregistered during disconnect. [#6125](https://github.com/GetStream/stream-chat-android/pull/6125)
 - Fix crash when `onNext` is called on a disposed subscription. [#6126](https://github.com/GetStream/stream-chat-android/pull/6126)
 
+
 ### ⬆️ Improved
 
 ### ✅ Added

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/StreamLifecycleObserver.kt

@@ -22,6 +22,7 @@ import androidx.lifecycle.LifecycleOwner
 import io.getstream.chat.android.core.internal.coroutines.DispatcherProvider
 import io.getstream.log.taggedLogger
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.util.concurrent.atomic.AtomicBoolean
@@ -38,20 +39,20 @@ internal class StreamLifecycleObserver(
     private val isObserving = AtomicBoolean(false)
 
     suspend fun observe(handler: LifecycleHandler) {
-        if (isObserving.compareAndSet(false, true)) {
-            recurringResumeEvent = false
-            withContext(DispatcherProvider.Main) {
+        withContext(DispatcherProvider.Main) {
+            handlers = handlers + handler
+            if (isObserving.compareAndSet(false, true)) {
+                recurringResumeEvent = false
                 lifecycle.addObserver(this@StreamLifecycleObserver)
                 logger.v { "[observe] subscribed" }
             }
         }
-        handlers = handlers + handler
     }
 
     suspend fun dispose(handler: LifecycleHandler) {
-        handlers = handlers - handler
-        if (handlers.isEmpty() && isObserving.compareAndSet(true, false)) {
-            withContext(DispatcherProvider.Main) {
+        withContext(NonCancellable + DispatcherProvider.Main) {
+            handlers = handlers - handler
+            if (handlers.isEmpty() && isObserving.compareAndSet(true, false)) {
                 lifecycle.removeObserver(this@StreamLifecycleObserver)
                 logger.v { "[dispose] unsubscribed" }
             }

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/socket/ChatSocket.kt

@@ -141,7 +141,7 @@ internal open class ChatSocket(
                                 tokenManager.expireToken()
                                 streamWebSocket?.close()
                                 healthMonitor.stop()
-                                userScope.launch { disposeObservers() }
+                                disposeObservers()
                             }
                             is State.Disconnected.NetworkDisconnected -> {
                                 streamWebSocket?.close()
@@ -156,7 +156,7 @@ internal open class ChatSocket(
                                 tokenManager.expireToken()
                                 streamWebSocket?.close()
                                 healthMonitor.stop()
-                                userScope.launch { disposeObservers() }
+                                disposeObservers()
                             }
                             is State.Disconnected.DisconnectedTemporarily -> {
                                 healthMonitor.onDisconnected()
@@ -205,9 +205,9 @@ internal open class ChatSocket(
         networkStateProvider.subscribe(networkStateListener)
     }
 
-    private suspend fun disposeObservers() {
-        lifecycleObserver.dispose(lifecycleHandler)
+    private fun disposeObservers() {
         disposeNetworkStateObserver()
+        userScope.launch { lifecycleObserver.dispose(lifecycleHandler) }
     }
 
     private fun disposeNetworkStateObserver() {