Moved vpnMenuItem feature to browserConfig sub-feature

Author: nalcalag

app/src/main/java/com/duckduckgo/app/browser/menu/VpnMenuItemFeature.kt

@@ -17,6 +17,7 @@
 package com.duckduckgo.app.browser.menu
 
 import com.duckduckgo.app.browser.viewstate.VpnMenuState
+import com.duckduckgo.app.pixels.remoteconfig.AndroidBrowserConfigFeature
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.networkprotection.api.NetworkProtectionState
 import com.duckduckgo.subscriptions.api.Product.NetP
@@ -35,7 +36,7 @@ interface VpnMenuStateProvider {
 class VpnMenuStateProviderImpl @Inject constructor(
     private val subscriptions: Subscriptions,
     private val networkProtectionState: NetworkProtectionState,
-    private val vpnMenuItemFeature: VpnMenuItemFeature,
+    private val androidBrowserConfigFeature: AndroidBrowserConfigFeature,
 ) : VpnMenuStateProvider {
 
     override fun getVpnMenuState(): Flow<VpnMenuState> {
@@ -44,7 +45,7 @@ class VpnMenuStateProviderImpl @Inject constructor(
             subscriptions.getEntitlementStatus(),
             networkProtectionState.getConnectionStateFlow(),
         ) { subscriptionStatus, entitlements, connectionState ->
-            if (!vpnMenuItemFeature.self().isEnabled()) {
+            if (!androidBrowserConfigFeature.vpnMenuItem().isEnabled()) {
                 return@combine VpnMenuState.Hidden
             }
 

app/src/main/java/com/duckduckgo/app/browser/menu/VpnMenuStateProvider.kt

@@ -179,4 +179,12 @@ interface AndroidBrowserConfigFeature {
      */
     @Toggle.DefaultValue(DefaultFeatureValue.TRUE)
     fun establishedAppStageGuard(): Toggle
+
+    /**
+     * @return `true` when the remote config has the global "vpnMenuItem" androidBrowserConfig
+     * sub-feature flag enabled
+     * If the remote feature is not present defaults to `false`
+     */
+    @Toggle.DefaultValue(DefaultFeatureValue.FALSE)
+    fun vpnMenuItem(): Toggle
 }

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

@@ -18,6 +18,7 @@ package com.duckduckgo.app.browser.menu
 
 import app.cash.turbine.test
 import com.duckduckgo.app.browser.viewstate.VpnMenuState
+import com.duckduckgo.app.pixels.remoteconfig.AndroidBrowserConfigFeature
 import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.feature.toggles.api.Toggle
 import com.duckduckgo.networkprotection.api.NetworkProtectionState
@@ -50,7 +51,7 @@ class VpnMenuStateProviderTest {
     private val connectionState: ConnectionState = mock()
 
     @Mock
-    private val vpnMenuItemFeature: VpnMenuItemFeature = mock()
+    private val androidBrowserConfigFeature: AndroidBrowserConfigFeature = mock()
 
     @Mock
     private val featureToggle: Toggle = mock()
@@ -59,9 +60,9 @@ class VpnMenuStateProviderTest {
 
     @Before
     fun setUp() {
-        whenever(vpnMenuItemFeature.self()).thenReturn(featureToggle)
+        whenever(androidBrowserConfigFeature.vpnMenuItem()).thenReturn(featureToggle)
         whenever(featureToggle.isEnabled()).thenReturn(true)
-        testee = VpnMenuStateProviderImpl(subscriptions, networkProtectionState, vpnMenuItemFeature)
+        testee = VpnMenuStateProviderImpl(subscriptions, networkProtectionState, androidBrowserConfigFeature)
     }
 
     @Test