Skip to content

Commit b658d9f

Browse files
committed
Replace the use of feature flags with the repository
1 parent 0e86bed commit b658d9f

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ import com.duckduckgo.app.browser.model.BasicAuthenticationRequest
192192
import com.duckduckgo.app.browser.model.LongPressTarget
193193
import com.duckduckgo.app.browser.newtab.FavoritesQuickAccessAdapter
194194
import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter
195+
import com.duckduckgo.app.browser.omnibar.OmnibarFeatureRepository
195196
import com.duckduckgo.app.browser.omnibar.QueryOrigin
196197
import com.duckduckgo.app.browser.omnibar.QueryOrigin.FromAutocomplete
197198
import com.duckduckgo.app.browser.refreshpixels.RefreshPixelSender
@@ -488,6 +489,7 @@ class BrowserTabViewModel @Inject constructor(
488489
private val webViewCompatWrapper: WebViewCompatWrapper,
489490
private val addressBarTrackersAnimationFeatureToggle: AddressBarTrackersAnimationFeatureToggle,
490491
private val autoconsentPixelManager: AutoconsentPixelManager,
492+
private val omnibarFeatureRepository: OmnibarFeatureRepository,
491493
) : ViewModel(),
492494
WebViewClientListener,
493495
EditSavedSiteListener,
@@ -556,9 +558,7 @@ class BrowserTabViewModel @Inject constructor(
556558
get() = site?.title
557559

558560
val isSplitOmnibarEnabled: Boolean by lazy {
559-
androidBrowserConfig.useUnifiedOmnibarLayout().isEnabled() &&
560-
androidBrowserConfig.splitOmnibar().isEnabled() &&
561-
settingsDataStore.omnibarType == OmnibarType.SPLIT
561+
omnibarFeatureRepository.isSplitOmnibarAvailable && settingsDataStore.omnibarType == OmnibarType.SPLIT
562562
}
563563

564564
private var locationPermissionRequest: LocationPermissionRequest? = null

app/src/main/java/com/duckduckgo/app/pixels/remoteconfig/AndroidBrowserConfigFeature.kt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import com.duckduckgo.anvil.annotations.ContributesRemoteFeature
2020
import com.duckduckgo.di.scopes.AppScope
2121
import com.duckduckgo.feature.toggles.api.Toggle
2222
import com.duckduckgo.feature.toggles.api.Toggle.DefaultFeatureValue
23-
import com.duckduckgo.feature.toggles.api.Toggle.DefaultFeatureValue.FALSE
24-
import com.duckduckgo.feature.toggles.api.Toggle.DefaultFeatureValue.TRUE
2523

2624
/**
2725
* This is the class that represents the browser feature flags
@@ -181,10 +179,19 @@ interface AndroidBrowserConfigFeature {
181179
@Toggle.DefaultValue(DefaultFeatureValue.FALSE)
182180
fun vpnMenuItem(): Toggle
183181

184-
@Toggle.DefaultValue(TRUE)
182+
/**
183+
* @return `true` when the remote config has the global "useUnifiedOmnibarLayout" androidBrowserConfig
184+
* sub-feature flag enabled
185+
* If the remote feature is not present defaults to `true`
186+
*/
187+
@Toggle.DefaultValue(DefaultFeatureValue.TRUE)
185188
fun useUnifiedOmnibarLayout(): Toggle
186189

187-
@Toggle.DefaultValue(FALSE)
188-
@Toggle.InternalAlwaysEnabled
190+
/**
191+
* @return `true` when the remote config has the global "splitOmnibar" androidBrowserConfig
192+
* sub-feature flag enabled
193+
* If the remote feature is not present defaults to `false`
194+
*/
195+
@Toggle.DefaultValue(DefaultFeatureValue.FALSE)
189196
fun splitOmnibar(): Toggle
190197
}

0 commit comments

Comments
 (0)