Merge branch 'fix-potential-crash-in-connection-state-function-droid-1224'

1 files changed, 11 insertions, 7 deletions

diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/ManagedChannel.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/ManagedChannel.kt
index 3f98ae93d8..a0e5bd5fd1 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/ManagedChannel.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/ManagedChannel.kt
@@ -1,24 +1,28 @@
 package net.mullvad.mullvadvpn.lib.daemon.grpc.util
 
+import co.touchlab.kermit.Logger
 import io.grpc.ConnectivityState
 import io.grpc.ManagedChannel
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.isActive
+import kotlinx.coroutines.suspendCancellableCoroutine
 
+@OptIn(ExperimentalCoroutinesApi::class)
 internal fun ManagedChannel.connectivityFlow(): Flow<ConnectivityState> {
     return callbackFlow {
         var currentState = getState(false)
-        send(currentState)
 
         while (isActive) {
-            currentState =
-                suspendCoroutine<ConnectivityState> {
-                    notifyWhenStateChanged(currentState) { it.resume(getState(false)) }
-                }
+            // Check that we are active before sending
             send(currentState)
+            currentState = suspendCancellableCoroutine {
+                notifyWhenStateChanged(currentState) {
+                    // If we are cancelled we will just log
+                    it.resume(getState(false)) { Logger.w("Resume while cancelled", it) }
+                }
+            }
         }
     }
 }