From a5f41dd5cd12404fe2ad54dbee808a077c5245a3 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Tue, 15 Nov 2022 15:52:41 -0500
Subject: [PATCH] [fenix] Close
 https://github.com/mozilla-mobile/fenix/issues/26475: Remove more feature
 flags

---
 app/src/main/java/org/mozilla/fenix/FeatureFlags.kt        | 5 -----
 .../org/mozilla/fenix/settings/HomeSettingsFragment.kt     | 1 -
 app/src/main/java/org/mozilla/fenix/utils/Settings.kt      | 7 +------
 app/src/main/res/xml/home_preferences.xml                  | 3 +--
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 9ae76c423..6e95842d4 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -31,11 +31,6 @@ object FeatureFlags {
      */
     const val syncAddressesFeature = false
 
-    /**
-     * Enables UI features based on history metadata.
-     */
-    const val historyMetadataUIFeature = true
-
     /**
      * Show Pocket recommended stories on home.
      */
diff --git a/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt
index 1c0d980d9..c6e6a0ff3 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt
@@ -143,7 +143,6 @@ class HomeSettingsFragment : PreferenceFragmentCompat() {
         }
 
         requirePreference<SwitchPreference>(R.string.pref_key_history_metadata_feature).apply {
-            isVisible = FeatureFlags.historyMetadataUIFeature
             isChecked = context.settings().historyMetadataUIFeature
             onPreferenceChangeListener = object : SharedPreferenceUpdater() {
                 override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
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 82e7fa45b..7f93500a6 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -1257,11 +1257,6 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         ).contains(langTag)
     }
 
-    private var isHistoryMetadataEnabled by booleanPreference(
-        appContext.getPreferenceKey(R.string.pref_key_history_metadata_feature),
-        default = false,
-    )
-
     private val mr2022Sections: Map<Mr2022Section, Boolean>
         get() =
             FxNimbus.features.mr2022.value().sectionsEnabled
@@ -1277,7 +1272,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
     var historyMetadataUIFeature by lazyFeatureFlagPreference(
         appContext.getPreferenceKey(R.string.pref_key_history_metadata_feature),
         default = { homescreenSections[HomeScreenSection.RECENT_EXPLORATIONS] == true },
-        featureFlag = FeatureFlags.historyMetadataUIFeature || isHistoryMetadataEnabled,
+        featureFlag = true,
     )
 
     /**
diff --git a/app/src/main/res/xml/home_preferences.xml b/app/src/main/res/xml/home_preferences.xml
index 1511a4b14..f377a862d 100644
--- a/app/src/main/res/xml/home_preferences.xml
+++ b/app/src/main/res/xml/home_preferences.xml
@@ -25,8 +25,7 @@
 
     <androidx.preference.SwitchPreference
         android:key="@string/pref_key_history_metadata_feature"
-        android:title="@string/customize_toggle_recently_visited"
-        app:isPreferenceVisible="false" />
+        android:title="@string/customize_toggle_recently_visited" />
 
     <androidx.preference.SwitchPreference
         android:key="@string/pref_key_pocket_homescreen_recommendations"