For #3929: Prevent cancellation of concurrent search engine operation

mozilla-mobile · Aug 30, 2019 · ee70ba7 · ee70ba7
1 parent f2f974f
commit ee70ba7
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/...nts/browser/search/src/main/java/mozilla/components/browser/search/SearchEngineManager.kt b/...nts/browser/search/src/main/java/mozilla/components/browser/search/SearchEngineManager.kt
@@ -44,11 +44,11 @@ class SearchEngineManager(
      */
     @Synchronized
     suspend fun loadAsync(context: Context): Deferred<SearchEngineList> = coroutineScope {
-        // We might have previous 'load' calls still running; cancel them.
-        deferredSearchEngines?.cancel()
-        scope.async {
+        deferredSearchEngines ?: scope.async {
             loadSearchEngines(context)
-        }.also { deferredSearchEngines = it }
+        }.also {
+            deferredSearchEngines = it
+        }
     }
 
     /**
@@ -77,8 +77,7 @@ class SearchEngineManager(
      * a load asynchronously.
      */
     private suspend fun getSearchEngineListAsync(context: Context): SearchEngineList =
-        (deferredSearchEngines ?: loadAsync(context))
-                .await()
+        loadAsync(context).await()
 
     /**
      * Returns all search engines.