From 167445786937aa00c2221c4c1b8f477d656740c6 Mon Sep 17 00:00:00 2001 From: mike a Date: Tue, 15 Aug 2023 14:50:10 -0700 Subject: [PATCH] =?UTF-8?q?Bug=201845613=20=E2=80=93=C2=A0restore=20hidden?= =?UTF-8?q?=20engines=20for=20unified=20search=20settings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit a0687ea720893dafb407f405bd1449845b9b5dbc) --- app/src/main/java/org/mozilla/fenix/HomeActivity.kt | 5 +++++ app/src/main/java/org/mozilla/fenix/utils/Settings.kt | 10 ++++++++++ app/src/main/res/values/preference_keys.xml | 1 + 3 files changed, 16 insertions(+) diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index d01f398cc2..5bb4058196 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -366,6 +366,11 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { components.core.contileTopSitesUpdater.startPeriodicWork() } + if (settings().enableUnifiedSearchSettingsUI && !settings().hiddenEnginesRestored) { + settings().hiddenEnginesRestored = true + components.useCases.searchUseCases.restoreHiddenSearchEngines.invoke() + } + // To assess whether the Pocket stories are to be downloaded or not multiple SharedPreferences // are read possibly needing to load them on the current thread. Move that to a background thread. lifecycleScope.launch(IO) { 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 5cb74bed71..01ed68bbe6 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -1830,4 +1830,14 @@ class Settings(private val appContext: Context) : PreferencesHolder { * Indicates if the new Search settings UI is enabled. */ var enableUnifiedSearchSettingsUI: Boolean = showUnifiedSearchFeature && FeatureFlags.unifiedSearchSettings + + /** + * Indicates if hidden engines were restored due to migration to unified search settings UI. + * Should be removed once we expect the majority of the users to migrate. + * Tracking: https://bugzilla.mozilla.org/show_bug.cgi?id=1850767 + */ + var hiddenEnginesRestored: Boolean by booleanPreference( + appContext.getPreferenceKey(R.string.pref_key_hidden_engines_restored), + default = false, + ) } diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml index 5e26ad1061..82074ffada 100644 --- a/app/src/main/res/values/preference_keys.xml +++ b/app/src/main/res/values/preference_keys.xml @@ -75,6 +75,7 @@ pref_key_is_first_splash_screen_shown pref_key_nimbus_last_fetch pref_key_home_blocklist + pref_key_hidden_engines_restored pref_key_telemetry