From b1102c2e76ae65a48ebd01e16f5c9b2571528e16 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Tue, 18 Jun 2019 15:00:30 -0700
Subject: [PATCH] For #3544 - Set SearchSuggestions preference value from
 settings

---
 .../fenix/search/awesomebar/AwesomeBarUIView.kt      |  6 +++---
 .../mozilla/fenix/settings/SearchEngineFragment.kt   | 12 +++++++++---
 .../main/java/org/mozilla/fenix/utils/Settings.kt    |  8 ++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
index 5f166ea0c..be94682df 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
@@ -128,7 +128,7 @@ class AwesomeBarUIView(
                     components.core.icons
                 )
 
-            if (Settings.getInstance(container.context).showSearchSuggestions()) {
+            if (Settings.getInstance(container.context).showSearchSuggestions) {
                 val searchDrawable = getDrawable(R.drawable.ic_search)
                 searchDrawable?.setColorFilter(
                     ContextCompat.getColor(
@@ -171,7 +171,7 @@ class AwesomeBarUIView(
     }
 
     private fun showSuggestionProviders() {
-        if (Settings.getInstance(container.context).showSearchSuggestions()) {
+        if (Settings.getInstance(container.context).showSearchSuggestions) {
             view.addProviders(searchSuggestionProvider!!)
         }
 
@@ -187,7 +187,7 @@ class AwesomeBarUIView(
     }
 
     private fun showSearchSuggestionProvider() {
-        if (Settings.getInstance(container.context).showSearchSuggestions()) {
+        if (Settings.getInstance(container.context).showSearchSuggestions) {
             view.addProviders(searchSuggestionProvider!!)
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt
index cca5ae65c..725989965 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt
@@ -6,8 +6,8 @@ package org.mozilla.fenix.settings
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreference
 import org.mozilla.fenix.R
 import org.mozilla.fenix.utils.Settings
 
@@ -23,7 +23,10 @@ class SearchEngineFragment : PreferenceFragmentCompat() {
         (activity as AppCompatActivity).supportActionBar?.show()
 
         val searchSuggestionsPreference =
-            findPreference<Preference>(getString(R.string.pref_key_show_search_suggestions))
+            findPreference<SwitchPreference>(getString(R.string.pref_key_show_search_suggestions))?.apply {
+                isChecked = Settings.getInstance(context).showSearchSuggestions
+            }
+
         searchSuggestionsPreference?.setOnPreferenceChangeListener { preference, newValue ->
             Settings.getInstance(preference.context).preferences.edit().putBoolean(preference.key, newValue as Boolean)
                 .apply()
@@ -31,7 +34,10 @@ class SearchEngineFragment : PreferenceFragmentCompat() {
         }
 
         val showVisitedSitesBookmarks =
-            findPreference<Preference>(getString(R.string.pref_key_show_visited_sites_bookmarks))
+            findPreference<SwitchPreference>(getString(R.string.pref_key_show_visited_sites_bookmarks))?.apply {
+                isChecked = Settings.getInstance(context).shouldShowVisitedSitesBookmarks
+            }
+
         showVisitedSitesBookmarks?.setOnPreferenceChangeListener { preference, newValue ->
             Settings.getInstance(preference.context).preferences.edit().putBoolean(preference.key, newValue as Boolean)
                 .apply()
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 7572d615b..96b5b9c34 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -168,10 +168,10 @@ class Settings private constructor(context: Context) {
             .apply()
     }
 
-    fun showSearchSuggestions(): Boolean = preferences.getBoolean(
-        appContext.getPreferenceKey(R.string.pref_key_show_search_suggestions),
-        true
-    )
+    val showSearchSuggestions: Boolean
+        get() = preferences.getBoolean(
+            appContext.getPreferenceKey(R.string.pref_key_show_search_suggestions), true
+        )
 
     fun setSitePermissionsPhoneFeatureCameraAction(action: SitePermissionsRules.Action) {
         preferences.edit()