avoid ChildCancelledException Kotlin/kotlinx.coroutines#2550

GitLiveApp · Mar 5, 2021 · 505ba3c · 505ba3c
1 parent 6d339de
commit 505ba3c
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/firebase-common/src/commonMain/kotlin/dev/gitlive/firebase/extensions.kt b/firebase-common/src/commonMain/kotlin/dev/gitlive/firebase/extensions.kt
@@ -6,8 +6,6 @@ import kotlinx.coroutines.channels.SendChannel
 
 //workaround for https://github.com/Kotlin/kotlinx.coroutines/issues/974
 @ExperimentalCoroutinesApi
-fun <E> SendChannel<E>.safeOffer(element: E) = try {
-    !isClosedForSend && offer(element)
-} catch (e : ClosedSendChannelException) {
-    false
+fun <E> SendChannel<E>.safeOffer(element: E): Boolean {
+    return runCatching { !isClosedForSend && offer(element) }.getOrDefault(false)
 }