Enable recording of history metadata for all builds

This allows recording part of history metadata to ride the trains.
The UI features are still guarded by the secret settings flag (or,
enabled on debug builds).

app/src/main/java/org/mozilla/fenix/FeatureFlags.kt

@@ -45,9 +45,9 @@ object FeatureFlags {
     val showRecentTabsFeature = Config.channel.isNightlyOrDebug
 
     /**
-     * Enables recording of history metadata.
+     * Enables UI features based on history metadata.
      */
-    val historyMetadataFeature = Config.channel.isDebug
+    val historyMetadataUIFeature = Config.channel.isDebug
 
     /**
      * Enables the recently saved bookmarks feature in the home screen.

app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt

@@ -272,9 +272,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
     override fun onStop() {
         super.onStop()
         updateLastBrowseActivity()
-        if (requireContext().settings().historyMetadataFeature) {
+        updateHistoryMetadata()
-            updateHistoryMetadata()
-        }
         pwaOnboardingObserver?.stop()
     }
 

app/src/main/java/org/mozilla/fenix/components/Core.kt

@@ -208,13 +208,10 @@ class Core(
                 RecordingDevicesMiddleware(context),
                 PromptMiddleware(),
                 AdsTelemetryMiddleware(adsTelemetry),
-                LastMediaAccessMiddleware()
+                LastMediaAccessMiddleware(),
+                HistoryMetadataMiddleware(historyMetadataService)
             )
 
-        if (context.settings().historyMetadataFeature) {
-            middlewareList += HistoryMetadataMiddleware(historyMetadataService)
-        }
-
         BrowserStore(
             middleware = middlewareList + EngineMiddleware.create(engine)
         ).apply {

app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt

@@ -270,7 +270,7 @@ class HomeFragment : Fragment() {
             )
         }
 
-        if (requireContext().settings().historyMetadataFeature) {
+        if (requireContext().settings().historyMetadataUIFeature) {
             historyMetadataFeature.set(
                 feature = HistoryMetadataFeature(
                     homeStore = homeFragmentStore,

app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt

@@ -251,7 +251,7 @@ class AwesomeBarView(
         val providersToAdd = mutableSetOf<AwesomeBar.SuggestionProvider>()
 
         if (state.showHistorySuggestions) {
-            if (activity.settings().historyMetadataFeature) {
+            if (activity.settings().historyMetadataUIFeature) {
                 providersToAdd.add(combinedHistoryProvider)
             } else {
                 providersToAdd.add(historyStorageProvider)
@@ -285,7 +285,7 @@ class AwesomeBarView(
         providersToRemove.add(shortcutsEnginePickerProvider)
 
         if (!state.showHistorySuggestions) {
-            if (activity.settings().historyMetadataFeature) {
+            if (activity.settings().historyMetadataUIFeature) {
                 providersToRemove.add(combinedHistoryProvider)
             } else {
                 providersToRemove.add(historyStorageProvider)

app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt

@@ -36,7 +36,7 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
 
         requirePreference<SwitchPreference>(R.string.pref_key_history_metadata_feature).apply {
             isVisible = true
-            isChecked = context.settings().historyMetadataFeature
+            isChecked = context.settings().historyMetadataUIFeature
             onPreferenceChangeListener = object : SharedPreferenceUpdater() {
                 override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
                     val result = super.onPreferenceChange(preference, newValue)

app/src/main/java/org/mozilla/fenix/utils/Settings.kt

@@ -1101,10 +1101,10 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = false
     )
 
-    var historyMetadataFeature by featureFlagPreference(
+    var historyMetadataUIFeature by featureFlagPreference(
         appContext.getPreferenceKey(R.string.pref_key_history_metadata_feature),
-        default = FeatureFlags.historyMetadataFeature,
+        default = FeatureFlags.historyMetadataUIFeature,
-        featureFlag = FeatureFlags.historyMetadataFeature || isHistoryMetadataEnabled
+        featureFlag = FeatureFlags.historyMetadataUIFeature || isHistoryMetadataEnabled
     )
 
     /**