fix(SearchViewModel): Ensure only one search task is running

Infomaniak · Apr 5, 2023 · 809e17a · 809e17a
1 parent beccc7e
commit 809e17a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Mail/Views/Search/SearchViewModel.swift b/Mail/Views/Search/SearchViewModel.swift
@@ -69,7 +69,9 @@ enum SearchState {
             } else if !selectedFilters.contains(.folder) {
                 selectedFilters.append(.folder)
             }
-            Task {
+
+            currentSearchTask?.cancel()
+            currentSearchTask = Task {
                 await fetchThreads()
             }
         }
@@ -87,6 +89,7 @@ enum SearchState {
     private var resourceNext: String?
     private var lastSearch = ""
     private var searchFieldObservation: AnyCancellable?
+    private var currentSearchTask: Task<Void, Never>?
 
     init(mailboxManager: MailboxManager, folder: Folder) {
         self.mailboxManager = mailboxManager
@@ -157,7 +160,8 @@ enum SearchState {
             contacts = []
         }
 
-        Task {
+        currentSearchTask?.cancel()
+        currentSearchTask = Task {
             await fetchThreads()
         }
     }