Use cached feature flags to determine omnibar type

Author: 0nko

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

@@ -149,6 +149,7 @@ import com.duckduckgo.app.browser.omnibar.Omnibar.LogoClickListener
 import com.duckduckgo.app.browser.omnibar.Omnibar.OmnibarTextState
 import com.duckduckgo.app.browser.omnibar.Omnibar.TextListener
 import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
+import com.duckduckgo.app.browser.omnibar.OmnibarFeatureRepository
 import com.duckduckgo.app.browser.omnibar.OmnibarItemPressedListener
 import com.duckduckgo.app.browser.omnibar.QueryOrigin
 import com.duckduckgo.app.browser.print.PrintDocumentAdapterFactory
@@ -595,6 +596,9 @@ class BrowserTabFragment :
     @Inject
     lateinit var webViewCompatWrapper: WebViewCompatWrapper
 
+    @Inject
+    lateinit var omnibarFeatureRepository: OmnibarFeatureRepository
+
     /**
      * We use this to monitor whether the user was seeing the in-context Email Protection signup prompt
      * This is needed because the activity stack will be cleared if an external link is opened in our browser
@@ -1018,7 +1022,7 @@ class BrowserTabFragment :
         omnibar = Omnibar(
             omnibarType = settingsDataStore.omnibarType,
             binding = binding,
-            isUnifiedOmnibarEnabled = androidBrowserConfigFeature.useUnifiedOmnibarLayout().isEnabled(),
+            isUnifiedOmnibarEnabled = omnibarFeatureRepository.isUnifiedOmnibarEnabled,
         )
 
         webViewContainer = binding.webViewContainer

app/src/main/java/com/duckduckgo/app/browser/omnibar/SplitOmnibarFallbackObserver.kt renamed to app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarRepository.kt

@@ -17,39 +17,57 @@
 package com.duckduckgo.app.browser.omnibar
 
 import androidx.lifecycle.LifecycleOwner
+import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
 import com.duckduckgo.app.pixels.remoteconfig.AndroidBrowserConfigFeature
 import com.duckduckgo.app.settings.db.SettingsDataStore
 import com.duckduckgo.browser.ui.omnibar.OmnibarType
+import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesMultibinding
+import dagger.SingleInstanceIn
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-/**
- * Observes app lifecycle to ensure that if the Split Omnibar feature is disabled via remote config,
- * and the user had selected the Split Omnibar, we revert to Single Top Omnibar.
- * If the feature is re-enabled, we restore the user's choice.
- */
 @ContributesMultibinding(
     scope = AppScope::class,
     boundType = MainProcessLifecycleObserver::class,
 )
-class SplitOmnibarFallbackObserver @Inject constructor(
+@SingleInstanceIn(AppScope::class)
+class OmnibarFeatureRepository @Inject constructor(
     private val settingsDataStore: SettingsDataStore,
     private val browserFeatures: AndroidBrowserConfigFeature,
+    private val dispatcherProvider: DispatcherProvider,
+    @AppCoroutineScope private val coroutineScope: CoroutineScope,
 ) : MainProcessLifecycleObserver {
+    var isUnifiedOmnibarEnabled: Boolean = false
+        private set
+
+    var isSplitOmnibarEnabled: Boolean = false
+        private set
+
+    val isSplitOmnibarAvailable: Boolean
+        get() = isUnifiedOmnibarEnabled && isSplitOmnibarEnabled
+
     override fun onStart(owner: LifecycleOwner) {
-        super.onStart(owner)
+        updateFeatureFlags()
+    }
+
+    fun updateFeatureFlags() {
+        coroutineScope.launch(dispatcherProvider.io()) {
+            isUnifiedOmnibarEnabled = browserFeatures.useUnifiedOmnibarLayout().isEnabled()
+            isSplitOmnibarEnabled = browserFeatures.splitOmnibar().isEnabled()
+
+            resetOmnibarTypeIfNecessary()
+        }
+    }
 
-        if (settingsDataStore.omnibarType == OmnibarType.SPLIT &&
-            (!browserFeatures.useUnifiedOmnibarLayout().isEnabled() || !browserFeatures.splitOmnibar().isEnabled())
-        ) {
+    private fun resetOmnibarTypeIfNecessary() {
+        if (settingsDataStore.omnibarType == OmnibarType.SPLIT && !isSplitOmnibarAvailable) {
             settingsDataStore.isSplitOmnibarSelected = true
             settingsDataStore.omnibarType = OmnibarType.SINGLE_TOP
-        } else if (settingsDataStore.isSplitOmnibarSelected &&
-            browserFeatures.useUnifiedOmnibarLayout().isEnabled() &&
-            browserFeatures.splitOmnibar().isEnabled()
-        ) {
+        } else if (settingsDataStore.isSplitOmnibarSelected && isSplitOmnibarAvailable) {
             // Restore user's choice if the feature is re-enabled
             settingsDataStore.omnibarType = OmnibarType.SPLIT
             settingsDataStore.isSplitOmnibarSelected = false