From 3abffd5d77643188e752a5bf4a9aba31dbe7e3bd Mon Sep 17 00:00:00 2001
From: Will Hawkins <whh8b@obs.cr>
Date: Thu, 29 Aug 2019 15:48:46 -0400
Subject: [PATCH] Use new async API to load and access search engines

Use the new asynchronous features of the search engine
manager from a-c to avoid the latency required to load
the default search engine.
---
 app/src/main/java/org/mozilla/fenix/components/Search.kt | 9 ++++-----
 .../mozilla/fenix/search/awesomebar/AwesomeBarView.kt    | 5 ++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/Search.kt b/app/src/main/java/org/mozilla/fenix/components/Search.kt
index a050e5225..ee2ba9304 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Search.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Search.kt
@@ -31,12 +31,11 @@ class Search(private val context: Context) {
         ).apply {
             registerForLocaleUpdates(context)
             GlobalScope.launch {
-                loadAsync(context).await()
+                defaultSearchEngine = getDefaultSearchEngineAsync(
+                    context,
+                    Settings.getInstance(context).defaultSearchEngineName
+                )
             }
-            defaultSearchEngine = getDefaultSearchEngine(
-                context,
-                Settings.getInstance(context).defaultSearchEngineName
-            )
         }
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
index 1d36c280d..3fac4cb3f 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
@@ -152,9 +152,8 @@ class AwesomeBarView(
 
             defaultSearchSuggestionProvider =
                 SearchSuggestionProvider(
-                    searchEngine = components.search.searchEngineManager.getDefaultSearchEngine(
-                        this
-                    ),
+                    context = this,
+                    searchEngineManager = components.search.searchEngineManager,
                     searchUseCase = searchUseCase,
                     fetchClient = components.core.client,
                     mode = SearchSuggestionProvider.Mode.MULTIPLE_SUGGESTIONS,