From 8d442c062d25a529c65a574c8b7079a255535a3e Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Tue, 12 Mar 2019 10:17:15 -0700
Subject: [PATCH] Closes #884 - Set and use default search engine

---
 app/src/main/java/org/mozilla/fenix/components/Search.kt     | 5 +++++
 app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt     | 3 +--
 .../fenix/settings/RadioSearchEngineListPreference.kt        | 2 ++
 3 files changed, 8 insertions(+), 2 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 cf31a6ba0..7746b1db2 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Search.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Search.kt
@@ -8,6 +8,7 @@ import android.content.Context
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import mozilla.components.browser.search.SearchEngineManager
+import org.mozilla.fenix.utils.Settings
 
 /**
  * Component group for all search engine integration related functionality.
@@ -23,6 +24,10 @@ class Search(private val context: Context) {
             GlobalScope.launch {
                 load(context).await()
             }
+            defaultSearchEngine = getDefaultSearchEngine(
+                context,
+                Settings.getInstance(context).defaultSearchEngineName
+            )
         }
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index d4c97d1be..d871b0914 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -112,8 +112,7 @@ class HomeFragment : Fragment() {
         })
 
         val searchIcon = requireComponents.search.searchEngineManager.getDefaultSearchEngine(
-            requireContext(),
-            Settings.getInstance(requireContext()).defaultSearchEngineName
+            requireContext()
         ).let {
             BitmapDrawable(resources, it.icon)
         }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/RadioSearchEngineListPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/RadioSearchEngineListPreference.kt
index cc1ccd96c..928cd7915 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/RadioSearchEngineListPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/RadioSearchEngineListPreference.kt
@@ -10,6 +10,7 @@ import android.widget.CompoundButton
 import android.widget.RadioGroup
 import androidx.preference.PreferenceViewHolder
 import org.mozilla.fenix.R
+import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.utils.Settings
 
 class RadioSearchEngineListPreference : SearchEngineListPreference,
@@ -45,6 +46,7 @@ class RadioSearchEngineListPreference : SearchEngineListPreference,
         }
 
         val newDefaultEngine = searchEngines[checkedId]
+        context.components.search.searchEngineManager.defaultSearchEngine = newDefaultEngine
         Settings.getInstance(group.context).setDefaultSearchEngineByName(newDefaultEngine.name)
     }
 }