Remove api dependencies from privacy-config-api and vpn-api modules (#…

…2103)

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt

@@ -4185,7 +4185,7 @@ class BrowserTabViewModelTest {
 
     private fun givenUrlCannotUseGpc(url: String) {
         val exceptions = CopyOnWriteArrayList<GpcException>().apply { add(GpcException(url)) }
-        whenever(mockFeatureToggle.isFeatureEnabled(eq(PrivacyFeatureName.GpcFeatureName), any())).thenReturn(true)
+        whenever(mockFeatureToggle.isFeatureEnabled(eq(PrivacyFeatureName.GpcFeatureName.value), any())).thenReturn(true)
         whenever(mockGpcRepository.isGpcEnabled()).thenReturn(true)
         whenever(mockGpcRepository.exceptions).thenReturn(exceptions)
     }

app/src/androidTest/java/com/duckduckgo/app/email/EmailInjectorJsTest.kt

@@ -47,7 +47,7 @@ class EmailInjectorJsTest {
         testee =
             EmailInjectorJs(mockEmailManager, DuckDuckGoUrlDetector(), mockDispatcherProvider, mockFeatureToggle, javascriptInjector, mockAutofill)
 
-        whenever(mockFeatureToggle.isFeatureEnabled(AutofillFeatureName)).thenReturn(true)
+        whenever(mockFeatureToggle.isFeatureEnabled(AutofillFeatureName.value)).thenReturn(true)
         whenever(mockAutofill.isAnException(any())).thenReturn(false)
     }
 
@@ -68,7 +68,7 @@ class EmailInjectorJsTest {
     @Test
     @SdkSuppress(minSdkVersion = 24)
     fun whenInjectAddressAndFeatureIsDisabledThenJsCodeNotInjected() {
-        whenever(mockFeatureToggle.isFeatureEnabled(AutofillFeatureName)).thenReturn(false)
+        whenever(mockFeatureToggle.isFeatureEnabled(AutofillFeatureName.value)).thenReturn(false)
 
         val address = "address"
         val webView = spy(WebView(InstrumentationRegistry.getInstrumentation().targetContext))
@@ -123,7 +123,7 @@ class EmailInjectorJsTest {
     @SdkSuppress(minSdkVersion = 24)
     fun whenNotifyWebAppSignEventAndUrlIsFromDuckDuckGoAndFeatureIsDisabledAndEmailIsNotSignedInThenDoNotEvaluateJsCode() {
         whenever(mockEmailManager.isSignedIn()).thenReturn(false)
-        whenever(mockFeatureToggle.isFeatureEnabled(AutofillFeatureName)).thenReturn(false)
+        whenever(mockFeatureToggle.isFeatureEnabled(AutofillFeatureName.value)).thenReturn(false)
 
         val jsToEvaluate = getNotifySignOutJsToEvaluate()
         val webView = spy(WebView(InstrumentationRegistry.getInstrumentation().targetContext))
@@ -138,7 +138,7 @@ class EmailInjectorJsTest {
     @SdkSuppress(minSdkVersion = 24)
     fun whenNotifyWebAppSignEventAndUrlIsFromDuckDuckGoAndFeatureIsEnabledAndEmailIsNotSignedInThenEvaluateJsCode() {
         whenever(mockEmailManager.isSignedIn()).thenReturn(false)
-        whenever(mockFeatureToggle.isFeatureEnabled(AutofillFeatureName)).thenReturn(true)
+        whenever(mockFeatureToggle.isFeatureEnabled(AutofillFeatureName.value)).thenReturn(true)
 
         val jsToEvaluate = getNotifySignOutJsToEvaluate()
         val webView = spy(WebView(InstrumentationRegistry.getInstrumentation().targetContext))

app/src/androidTest/java/com/duckduckgo/app/fakes/FeatureToggleFake.kt

@@ -16,12 +16,11 @@
 
 package com.duckduckgo.app.fakes
 
-import com.duckduckgo.feature.toggles.api.FeatureName
 import com.duckduckgo.feature.toggles.api.FeatureToggle
 
 class FeatureToggleFake : FeatureToggle {
     override fun isFeatureEnabled(
-        featureName: FeatureName,
+        featureName: String,
         defaultValue: Boolean
     ): Boolean = true
 }

app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/HttpsUpgraderTest.kt

@@ -44,14 +44,14 @@ class HttpsUpgraderTest {
     @Before
     fun before() {
         whenever(mockHttpsBloomFilterFactory.create()).thenReturn(bloomFilter)
-        whenever(mockFeatureToggle.isFeatureEnabled(PrivacyFeatureName.HttpsFeatureName)).thenReturn(true)
+        whenever(mockFeatureToggle.isFeatureEnabled(PrivacyFeatureName.HttpsFeatureName.value)).thenReturn(true)
         testee = HttpsUpgraderImpl(mockHttpsBloomFilterFactory, mockBloomFalsePositiveListDao, mockUserAllowlistDao, mockFeatureToggle, mockHttps)
         testee.reloadData()
     }
 
     @Test
     fun whenFeatureIsDisableTheShouldNotUpgrade() {
-        whenever(mockFeatureToggle.isFeatureEnabled(PrivacyFeatureName.HttpsFeatureName)).thenReturn(false)
+        whenever(mockFeatureToggle.isFeatureEnabled(PrivacyFeatureName.HttpsFeatureName.value)).thenReturn(false)
         bloomFilter.add("www.local.url")
         assertFalse(testee.shouldUpgrade(Uri.parse("http://www.local.url")))
     }

app/src/androidTest/java/com/duckduckgo/app/referencetests/HttpsReferenceTest.kt

@@ -169,7 +169,7 @@ class HttpsReferenceTest(private val testCase: TestCase) {
         val isEnabled = httpsFeature?.state == "enabled"
         val exceptionsUnprotectedTemporary = CopyOnWriteArrayList(config?.unprotectedTemporary ?: emptyList())
 
-        whenever(mockFeatureToggle.isFeatureEnabled(PrivacyFeatureName.HttpsFeatureName, isEnabled)).thenReturn(isEnabled)
+        whenever(mockFeatureToggle.isFeatureEnabled(PrivacyFeatureName.HttpsFeatureName.value, isEnabled)).thenReturn(isEnabled)
         whenever(mockHttpsRepository.exceptions).thenReturn(CopyOnWriteArrayList(httpsExceptions))
         whenever(mockUnprotectedTemporaryRepository.exceptions).thenReturn(exceptionsUnprotectedTemporary)
 

app/src/androidTestPlay/java/com/duckduckgo/app/integration/HttpsEmbeddedDataIntegrationTest.kt

@@ -55,7 +55,7 @@ class HttpsEmbeddedDataIntegrationTest {
 
     @Before
     fun before() {
-        whenever(mockFeatureToggle.isFeatureEnabled(PrivacyFeatureName.HttpsFeatureName)).thenReturn(true)
+        whenever(mockFeatureToggle.isFeatureEnabled(PrivacyFeatureName.HttpsFeatureName.value)).thenReturn(true)
 
         db = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .allowMainThreadQueries()

app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt

@@ -50,7 +50,7 @@ class BrokenSiteSubmitter(
 ) : BrokenSiteSender {
 
     override fun submitBrokenSiteFeedback(brokenSite: BrokenSite) {
-        val isGpcEnabled = (featureToggle.isFeatureEnabled(PrivacyFeatureName.GpcFeatureName) && gpc.isEnabled()).toString()
+        val isGpcEnabled = (featureToggle.isFeatureEnabled(PrivacyFeatureName.GpcFeatureName.value) && gpc.isEnabled()).toString()
         val absoluteUrl = Uri.parse(brokenSite.siteUrl).absoluteString
 
         appCoroutineScope.launch(dispatcherProvider.io()) {

app/src/main/java/com/duckduckgo/app/browser/useragent/UserAgentProvider.kt

@@ -78,7 +78,7 @@ class UserAgentProvider constructor(
 
         val isDomainInUserAllowList = isHostInUserAllowedList(host)
 
-        if (isDomainInUserAllowList || !toggle.isFeatureEnabled(PrivacyFeatureName.UserAgentFeatureName) || shouldUseDefaultUserAgent) {
+        if (isDomainInUserAllowList || !toggle.isFeatureEnabled(PrivacyFeatureName.UserAgentFeatureName.value) || shouldUseDefaultUserAgent) {
             return if (isDesktop) {
                 defaultUserAgent.get().replace(AgentRegex.platform, desktopPrefix)
             } else {

app/src/main/java/com/duckduckgo/app/email/EmailInjector.kt

@@ -90,7 +90,7 @@ class EmailInjectorJs(
         }
     }
 
-    private fun isFeatureEnabled() = featureToggle.isFeatureEnabled(PrivacyFeatureName.AutofillFeatureName, defaultValue = true)
+    private fun isFeatureEnabled() = featureToggle.isFeatureEnabled(PrivacyFeatureName.AutofillFeatureName.value, defaultValue = true)
 
     private fun isDuckDuckGoUrl(url: String?): Boolean = (url != null && urlDetector.isDuckDuckGoEmailUrl(url))
 

app/src/main/java/com/duckduckgo/app/email/EmailJavascriptInterface.kt

@@ -47,7 +47,7 @@ class EmailJavascriptInterface(
         return (url != null && urlDetector.isDuckDuckGoEmailUrl(url))
     }
 
-    private fun isFeatureEnabled() = featureToggle.isFeatureEnabled(PrivacyFeatureName.AutofillFeatureName, defaultValue = true)
+    private fun isFeatureEnabled() = featureToggle.isFeatureEnabled(PrivacyFeatureName.AutofillFeatureName.value, defaultValue = true)
 
     @JavascriptInterface
     fun isSignedIn(): String {

app/src/main/java/com/duckduckgo/app/globalprivacycontrol/ui/GlobalPrivacyControlViewModel.kt

@@ -52,7 +52,7 @@ class GlobalPrivacyControlViewModel @Inject constructor(
     init {
         _viewState.value = ViewState(
             globalPrivacyControlEnabled = gpc.isEnabled(),
-            globalPrivacyControlFeatureEnabled = featureToggle.isFeatureEnabled(PrivacyFeatureName.GpcFeatureName, true)
+            globalPrivacyControlFeatureEnabled = featureToggle.isFeatureEnabled(PrivacyFeatureName.GpcFeatureName.value, true)
         )
         pixel.fire(SETTINGS_DO_NOT_SELL_SHOWN)
     }

app/src/main/java/com/duckduckgo/app/httpsupgrade/HttpsUpgrader.kt

@@ -78,7 +78,7 @@ class HttpsUpgraderImpl @Inject constructor(
     override fun shouldUpgrade(uri: Uri): Boolean {
         val host = uri.host ?: return false
 
-        if (!toggle.isFeatureEnabled(PrivacyFeatureName.HttpsFeatureName)) {
+        if (!toggle.isFeatureEnabled(PrivacyFeatureName.HttpsFeatureName.value)) {
             Timber.d("https is disabled in the remote config and so $host is not upgradable")
             return false
         }

app/src/main/java/com/duckduckgo/app/settings/SettingsViewModel.kt

@@ -161,7 +161,7 @@ class SettingsViewModel @Inject constructor(
                     automaticallyClearData = AutomaticallyClearData(automaticallyClearWhat, automaticallyClearWhen, automaticallyClearWhenEnabled),
                     appIcon = settingsDataStore.appIcon,
                     selectedFireAnimation = settingsDataStore.selectedFireAnimation,
-                    globalPrivacyControlEnabled = gpc.isEnabled() && featureToggle.isFeatureEnabled(PrivacyFeatureName.GpcFeatureName) == true,
+                    globalPrivacyControlEnabled = gpc.isEnabled() && featureToggle.isFeatureEnabled(PrivacyFeatureName.GpcFeatureName.value),
                     appLinksSettingType = getAppLinksSettingsState(settingsDataStore.appLinksEnabled, settingsDataStore.showAppLinksPrompt),
                     appTrackingProtectionEnabled = TrackerBlockingVpnService.isServiceRunning(appContext),
                     appTrackingProtectionWaitlistState = atpRepository.getState(),

app/src/test/java/com/duckduckgo/app/browser/useragent/UserAgentProviderTest.kt

@@ -60,7 +60,7 @@ class UserAgentProviderTest {
     @Before
     fun before() {
         whenever(deviceInfo.majorAppVersion).thenReturn("5")
-        whenever(toggle.isFeatureEnabled(PrivacyFeatureName.UserAgentFeatureName)).thenReturn(true)
+        whenever(toggle.isFeatureEnabled(PrivacyFeatureName.UserAgentFeatureName.value)).thenReturn(true)
         whenever(userAgentRepository.defaultExceptions).thenReturn(defaultExceptions)
         whenever(userAgentRepository.omitApplicationExceptions).thenReturn(applicationExceptions)
         whenever(userAgentRepository.omitVersionExceptions).thenReturn(versionExceptions)
@@ -174,7 +174,7 @@ class UserAgentProviderTest {
 
     @Test
     fun whenFeatureIsDisabledThenUaIsDefault() {
-        whenever(toggle.isFeatureEnabled(PrivacyFeatureName.UserAgentFeatureName)).thenReturn(false)
+        whenever(toggle.isFeatureEnabled(PrivacyFeatureName.UserAgentFeatureName.value)).thenReturn(false)
         testee = getUserAgentProvider(Agent.DEFAULT, deviceInfo)
         val actual = testee.userAgent(DOMAIN)
         assertTrue("$actual does not match expected regex", ValidationRegex.default.matches(actual))

app/src/test/java/com/duckduckgo/app/email/EmailJavascriptInterfaceTest.kt

@@ -60,7 +60,7 @@ class EmailJavascriptInterfaceTest {
             mockAutofill
         ) { counter++ }
 
-        whenever(mockFeatureToggle.isFeatureEnabled(AutofillFeatureName)).thenReturn(true)
+        whenever(mockFeatureToggle.isFeatureEnabled(AutofillFeatureName.value)).thenReturn(true)
         whenever(mockAutofill.isAnException(any())).thenReturn(false)
     }
 
@@ -130,7 +130,7 @@ class EmailJavascriptInterfaceTest {
     @Test
     fun whenShowTooltipAndFeatureDisabledThenLambdaNotCalled() {
         whenever(mockWebView.url).thenReturn(NON_EMAIL_URL)
-        whenever(mockFeatureToggle.isFeatureEnabled(AutofillFeatureName)).thenReturn(false)
+        whenever(mockFeatureToggle.isFeatureEnabled(AutofillFeatureName.value)).thenReturn(false)
 
         testee.showTooltip()
 

app/src/test/java/com/duckduckgo/app/settings/SettingsViewModelTest.kt

@@ -160,7 +160,7 @@ class SettingsViewModelTest {
 
     @Test
     fun whenStartIfGpcToggleDisabledAndGpcEnabledThenGpgDisabled() = runTest {
-        whenever(mockFeatureToggle.isFeatureEnabled(eq(PrivacyFeatureName.GpcFeatureName), any())).thenReturn(false)
+        whenever(mockFeatureToggle.isFeatureEnabled(eq(PrivacyFeatureName.GpcFeatureName.value), any())).thenReturn(false)
         whenever(mockGpc.isEnabled()).thenReturn(true)
 
         testee.start()
@@ -173,7 +173,7 @@ class SettingsViewModelTest {
 
     @Test
     fun whenStartIfGpcToggleEnabledAndGpcDisabledThenGpgDisabled() = runTest {
-        whenever(mockFeatureToggle.isFeatureEnabled(eq(PrivacyFeatureName.GpcFeatureName), any())).thenReturn(true)
+        whenever(mockFeatureToggle.isFeatureEnabled(eq(PrivacyFeatureName.GpcFeatureName.value), any())).thenReturn(true)
         whenever(mockGpc.isEnabled()).thenReturn(false)
         testee.start()
 
@@ -185,7 +185,7 @@ class SettingsViewModelTest {
 
     @Test
     fun whenStartIfGpcToggleEnabledAndGpcEnabledThenGpgEnabled() = runTest {
-        whenever(mockFeatureToggle.isFeatureEnabled(eq(PrivacyFeatureName.GpcFeatureName), any())).thenReturn(true)
+        whenever(mockFeatureToggle.isFeatureEnabled(eq(PrivacyFeatureName.GpcFeatureName.value), any())).thenReturn(true)
         whenever(mockGpc.isEnabled()).thenReturn(true)
         testee.start()
 

feature-toggles/feature-toggles-api/src/main/java/com/duckduckgo/feature/toggles/api/FeatureToggle.kt

@@ -24,35 +24,7 @@ interface FeatureToggle {
      * @throws [IllegalArgumentException] if the feature is not implemented
      */
     fun isFeatureEnabled(
-        featureName: FeatureName,
+        featureName: String,
         defaultValue: Boolean = true
     ): Boolean
 }
-
-/**
- * Each feature toggle created needs a [FeatureName] which can be implemented using this interface
- */
-interface FeatureName {
-    val value: String
-
-    companion object {
-        /**
-         * Utility function to create a [FeatureName] from the passed in [block] lambda
-         * instead of using the anonymous `object : FeatureName` syntax.
-         *
-         * Usage:
-         *
-         * ```kotlin
-         * val feature = FeatureName {
-         *
-         * }
-         * ```
-         */
-        inline operator fun invoke(crossinline block: () -> String): FeatureName {
-            return object : FeatureName {
-                override val value: String
-                    get() = block()
-            }
-        }
-    }
-}

feature-toggles/feature-toggles-api/src/main/java/com/duckduckgo/feature/toggles/api/FeatureTogglesPlugin.kt

@@ -28,7 +28,7 @@ interface FeatureTogglesPlugin {
      * know the featureName. [defaultValue] if the plugin knows featureName but is not set
      */
     fun isEnabled(
-        featureName: FeatureName,
+        featureName: String,
         defaultValue: Boolean
     ): Boolean?
 }

feature-toggles/feature-toggles-impl/src/main/java/com/duckduckgo/feature/toggles/impl/RealFeatureTogglesImpl.kt

@@ -21,7 +21,6 @@ import com.duckduckgo.app.global.plugins.PluginPoint
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.feature.toggles.api.FeatureToggle
 import com.duckduckgo.feature.toggles.api.FeatureTogglesPlugin
-import com.duckduckgo.feature.toggles.api.FeatureName
 import com.squareup.anvil.annotations.ContributesBinding
 import javax.inject.Inject
 import dagger.SingleInstanceIn
@@ -32,14 +31,14 @@ class RealFeatureToggleImpl @Inject constructor(private val featureTogglesPlugin
     FeatureToggle {
 
     override fun isFeatureEnabled(
-        featureName: FeatureName,
+        featureName: String,
         defaultValue: Boolean
     ): Boolean {
         featureTogglesPluginPoint.getPlugins().forEach { plugin ->
             plugin.isEnabled(featureName, defaultValue)?.let { return it }
         }
 
-        throw IllegalArgumentException("Unknown feature: ${featureName.value}")
+        throw IllegalArgumentException("Unknown feature: $featureName")
     }
 }
 

feature-toggles/feature-toggles-impl/src/test/java/com/duckduckgo/feature/toggles/impl/RealFeatureToggleImplTest.kt

@@ -17,7 +17,6 @@
 package com.duckduckgo.feature.toggles.impl
 
 import com.duckduckgo.app.global.plugins.PluginPoint
-import com.duckduckgo.feature.toggles.api.FeatureName
 import com.duckduckgo.feature.toggles.api.FeatureTogglesPlugin
 import org.junit.Assert.*
 import org.junit.Test
@@ -29,22 +28,22 @@ class RealFeatureToggleImplTest {
 
     @Test
     fun whenFeatureNameCanBeHandledByPluginThenReturnTheCorrectValue() {
-        val result = testee.isFeatureEnabled(TrueFeatureName(), false)
+        val result = testee.isFeatureEnabled(TrueFeatureName().value, false)
         assertNotNull(result)
         assertTrue(result)
     }
 
     @Test(expected = IllegalArgumentException::class)
     fun whenFeatureNameCannotBeHandledByAnyPluginThenThrowException() {
-        testee.isFeatureEnabled(NullFeatureName(), false)
+        testee.isFeatureEnabled(NullFeatureName().value, false)
     }
 
     class FakeTruePlugin : FeatureTogglesPlugin {
         override fun isEnabled(
-            featureName: FeatureName,
+            featureName: String,
             defaultValue: Boolean
         ): Boolean? {
-            return if (featureName is TrueFeatureName) {
+            return if (featureName == TrueFeatureName().value) {
                 true
             } else {
                 null
@@ -58,6 +57,6 @@ class RealFeatureToggleImplTest {
         }
     }
 
-    data class TrueFeatureName(override val value: String = "true") : FeatureName
-    data class NullFeatureName(override val value: String = "null") : FeatureName
+    data class TrueFeatureName(val value: String = "true")
+    data class NullFeatureName(val value: String = "null")
 }

privacy-config/privacy-config-api/build.gradle

@@ -27,9 +27,6 @@ java {
 }
 
 dependencies {
-
-    implementation project(path: ':feature-toggles-api')
-
     implementation Google.dagger
     implementation Kotlin.stdlib.jdk7
 }

privacy-config/privacy-config-api/src/main/java/com/duckduckgo/privacy/config/api/PrivacyFeatureName.kt

@@ -16,10 +16,8 @@
 
 package com.duckduckgo.privacy.config.api
 
-import com.duckduckgo.feature.toggles.api.FeatureName
-
-/** List of [FeatureName] that belong to the Privacy Configuration */
-enum class PrivacyFeatureName(override val value: String) : FeatureName {
+/** List of [PrivacyFeatureName] that belong to the Privacy Configuration */
+enum class PrivacyFeatureName(val value: String) {
     ContentBlockingFeatureName("contentBlocking"),
     GpcFeatureName("gpc"),
     HttpsFeatureName("https"),

privacy-config/privacy-config-api/src/main/java/com/duckduckgo/privacy/config/api/PrivacyFeaturePlugin.kt

@@ -16,8 +16,6 @@
 
 package com.duckduckgo.privacy.config.api
 
-import com.duckduckgo.feature.toggles.api.FeatureName
-
 /**
  * Implement this interface and contribute it as a multibinding to get called upon downloading remote privacy config
  *
@@ -32,15 +30,15 @@ import com.duckduckgo.feature.toggles.api.FeatureName
  */
 interface PrivacyFeaturePlugin {
     /**
-     * @return `true` when the feature config was stored, otherwise `false`
+     * @return `true` when the feature was stored, otherwise `false`
      */
     fun store(
-        name: FeatureName,
+        featureName: String,
         jsonString: String
     ): Boolean
 
     /**
-     * @return the [FeatureName] of this feature
+     * @return the [featureName] of this feature
      */
-    val featureName: FeatureName
+    val featureName: String
 }