Add EventNotifier flow wrapper

1 files changed, 7 insertions, 0 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt
index a0a809f8ff..de76ff5b0b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt
@@ -17,6 +17,7 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.take
 import net.mullvad.mullvadvpn.model.ServiceResult
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionState
+import net.mullvad.talpid.util.EventNotifier
 
 fun <T> SendChannel<T>.safeOffer(element: T): Boolean {
     return runCatching { offer(element) }.getOrDefault(false)
@@ -78,3 +79,9 @@ fun <R> Flow<ServiceConnectionState>.flatMapReadyConnectionOrDefault(
         }
     }
 }
+
+fun <T> callbackFlowFromNotifier(notifier: EventNotifier<T>) = callbackFlow<T> {
+    val handler: (T) -> Unit = { value -> trySend(value) }
+    notifier.subscribe(this, handler)
+    awaitClose { notifier.unsubscribe(this) }
+}