From 824092c92674a9c04f8d7c36d404c3068bf6edb3 Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Sat, 20 Sep 2025 09:36:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20#5422?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/legado/app/utils/FlowExtensions.kt    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/legado/app/utils/FlowExtensions.kt b/app/src/main/java/io/legado/app/utils/FlowExtensions.kt
index 61c427b2b..494ff0a5e 100644
--- a/app/src/main/java/io/legado/app/utils/FlowExtensions.kt
+++ b/app/src/main/java/io/legado/app/utils/FlowExtensions.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flatMapMerge
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
@@ -198,7 +198,9 @@ fun <T> Flow<T>.flowWithLifecycleFirst(
     minActiveState: Lifecycle.State = Lifecycle.State.STARTED
 ): Flow<T> = callbackFlow {
     if (!lifecycle.currentState.isAtLeast(minActiveState)) {
-        send(first())
+        firstOrNull()?.let {
+            send(it)
+        }
     }
     lifecycle.repeatOnLifecycle(minActiveState) {
         this@flowWithLifecycleFirst.collect {
@@ -244,7 +246,9 @@ fun <T> Flow<T>.flowWithLifecycleAndDatabaseChangeFirst(
         .onEach { update++ }
         .produceIn(this)
     if (!isActive) {
-        send(first())
+        firstOrNull()?.let {
+            send(it)
+        }
     }
     lifecycle.repeatOnLifecycle(minActiveState) {
         if (update == 0) {