Fix potential crash in connection state flow

mullvad · Aug 5, 2024 · a2649ec · a2649ec
1 parent 7af6b25
commit a2649ec
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/ManagedChannel.kt b/...daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/ManagedChannel.kt
@@ -4,6 +4,8 @@ import io.grpc.ConnectivityState
 import io.grpc.ManagedChannel
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.isActive
@@ -20,5 +22,7 @@ internal fun ManagedChannel.connectivityFlow(): Flow<ConnectivityState> {
                 }
             send(currentState)
         }
+
+        awaitClose { cancel() }
     }
 }