From e59a5d198ffa552109fede6bfcba93121ca5985b Mon Sep 17 00:00:00 2001
From: HapeLee <63206378+HapeLee@users.noreply.github.com>
Date: Mon, 29 Jun 2026 02:26:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AF=A6=E6=83=85=E9=A1=B5=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=AD=89=E5=BE=85=E5=B9=B6=E4=BD=BF=E7=94=A8=E5=B7=B2?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E6=90=9C=E7=B4=A2=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9E=E4=B8=8D=E5=86=8D=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/search/SearchViewModel.kt     | 32 ++++++++++++++++---
 .../io/legado/app/ui/main/MainNavGraph.kt     |  1 -
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt
index 6f15947ad..792730c50 100644
--- a/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt
@@ -23,6 +23,9 @@ import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
@@ -37,8 +40,6 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalCoroutinesApi::class)
@@ -87,10 +88,15 @@ class SearchViewModel(
     private var persistedSearchScopeRaw = ""
     private var hasTemporaryScope = false
     private val searchScope = SearchScope("")
+    private val searchScopeReady = CompletableDeferred<Unit>()
     private val preferenceWriteScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
     private val searchControl = BookSearchControl()
     private val searchResultBooks = LinkedHashMap<SearchResultKey, SearchBook>()
 
+    private var initializeJob: Job? = null
+    private var lastInitializedKey: String? = null
+    private var lastInitializedScopeRaw: String? = null
+    private var hasInitialized = false
     private var searchJob: Job? = null
     private var currentSearchPage = 1
     private var resultCountBeforeCurrentPage = 0
@@ -323,6 +329,23 @@ class SearchViewModel(
     }
 
     private fun initialize(key: String?, scopeRaw: String?) {
+        initializeJob?.cancel()
+        initializeJob = viewModelScope.launch {
+            searchScopeReady.await()
+            initializeAfterScopeLoaded(key, scopeRaw)
+        }
+    }
+
+    private fun initializeAfterScopeLoaded(key: String?, scopeRaw: String?) {
+        val normalizedKey = key?.trim()
+        val normalizedScopeRaw = scopeRaw?.takeIf { it.isNotBlank() }
+        val isSameRequest = hasInitialized &&
+                lastInitializedKey == normalizedKey &&
+                lastInitializedScopeRaw == normalizedScopeRaw
+        lastInitializedKey = normalizedKey
+        lastInitializedScopeRaw = normalizedScopeRaw
+        hasInitialized = true
+
         val temporaryScope = scopeRaw?.takeIf { it.isNotBlank() }
         if (temporaryScope != null) {
             hasTemporaryScope = true
@@ -339,11 +362,11 @@ class SearchViewModel(
         // This happens when returning from BookInfo — the LaunchedEffect
         // re-fires but we must not wipe the existing results.
         val hasActiveSearch = _uiState.value.committedQuery.isNotEmpty()
-        if (hasActiveSearch) return
+        if (isSameRequest && hasActiveSearch) return
 
         clearSearchResults()
 
-        val initKey = key?.trim().orEmpty()
+        val initKey = normalizedKey.orEmpty()
         if (initKey.isNotEmpty()) {
             updateQuery(initKey, showSuggestions = false)
             submitSearch(initKey)
@@ -732,6 +755,7 @@ class SearchViewModel(
                         searchScope.update(scopeRaw, postValue = false)
                         syncScopeState()
                     }
+                    searchScopeReady.complete(Unit)
                 }
         }
     }
diff --git a/app/src/main/java/io/legado/app/ui/main/MainNavGraph.kt b/app/src/main/java/io/legado/app/ui/main/MainNavGraph.kt
index ed1c62d37..3cd043b42 100644
--- a/app/src/main/java/io/legado/app/ui/main/MainNavGraph.kt
+++ b/app/src/main/java/io/legado/app/ui/main/MainNavGraph.kt
@@ -455,7 +455,6 @@ fun MainActivity.mainEntryProvider(
         SearchScreen(
             viewModel = searchViewModel,
             onBack = {
-                searchViewModel.onIntent(SearchIntent.ClearSearchResults)
                 onNavigateBack()
             },
             onOpenBookInfo = { name, author, bookUrl, origin, coverPath, sharedCoverKey ->