SERP Settings Sync: Align feature flag names with other platforms

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

@@ -289,7 +289,7 @@ import com.duckduckgo.savedsites.api.models.SavedSite.Favorite
 import com.duckduckgo.savedsites.impl.SavedSitesPixelName
 import com.duckduckgo.serp.logos.api.SerpEasterEggLogosToggles
 import com.duckduckgo.serp.logos.api.SerpLogo
-import com.duckduckgo.settings.api.SettingsPageFeature
+import com.duckduckgo.settings.api.SerpSettingsFeature
 import com.duckduckgo.site.permissions.api.SitePermissionsManager
 import com.duckduckgo.site.permissions.api.SitePermissionsManager.LocationPermissionRequest
 import com.duckduckgo.site.permissions.api.SitePermissionsManager.SitePermissionQueryResponse
@@ -623,10 +623,9 @@ class BrowserTabViewModelTest {
     private val mockDeviceAppLookup: DeviceAppLookup = mock()
 
     private val mockDuckAiFullScreenMode = MutableStateFlow(false)
-    private val mockDuckAiFullScreenModeEnabled = MutableStateFlow(false)
 
     private lateinit var fakeContentScopeScriptsSubscriptionEventPluginPoint: FakeContentScopeScriptsSubscriptionEventPluginPoint
-    private var fakeSettingsPageFeature = FakeFeatureToggleFactory.create(SettingsPageFeature::class.java)
+    private var serpSettingsFeature = FakeFeatureToggleFactory.create(SerpSettingsFeature::class.java)
 
     @Before
     fun before() =
@@ -864,7 +863,7 @@ class BrowserTabViewModelTest {
                     autoconsentPixelManager = mockAutoconsentPixelManager,
                     omnibarRepository = mockOmnibarFeatureRepository,
                     contentScopeScriptsSubscriptionEventPluginPoint = fakeContentScopeScriptsSubscriptionEventPluginPoint,
-                    settingsPageFeature = fakeSettingsPageFeature,
+                    serpSettingsFeature = serpSettingsFeature,
                 )
 
             testee.loadData("abc", null, false, false)
@@ -7924,7 +7923,7 @@ class BrowserTabViewModelTest {
 
     @Test
     fun whenOnViewResumedWithNoPluginsThenNoSubscriptionEventsSent() = runTest {
-        fakeSettingsPageFeature.serpSettingsSync().setRawStoredState(State(enable = true))
+        serpSettingsFeature.storeSerpSettings().setRawStoredState(State(enable = true))
 
         testee.onViewResumed()
 
@@ -7936,7 +7935,7 @@ class BrowserTabViewModelTest {
 
     @Test
     fun whenOnViewResumedWithPluginsThenSubscriptionEventsSent() = runTest {
-        fakeSettingsPageFeature.serpSettingsSync().setRawStoredState(State(enable = true))
+        serpSettingsFeature.storeSerpSettings().setRawStoredState(State(enable = true))
         val events = mutableListOf<SubscriptionEventData>().apply {
             add(
                 SubscriptionEventData(
@@ -7973,7 +7972,7 @@ class BrowserTabViewModelTest {
 
     @Test
     fun whenOnViewResumedWithPluginsAndSerpSettingsFeatureFlagOffThenNoEventsSent() = runTest {
-        fakeSettingsPageFeature.serpSettingsSync().setRawStoredState(State(enable = false))
+        serpSettingsFeature.storeSerpSettings().setRawStoredState(State(enable = false))
         val events = mutableListOf<SubscriptionEventData>().apply {
             add(
                 SubscriptionEventData(

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

@@ -352,7 +352,7 @@ import com.duckduckgo.savedsites.impl.dialogs.EditSavedSiteDialogFragment.Delete
 import com.duckduckgo.savedsites.impl.dialogs.EditSavedSiteDialogFragment.EditSavedSiteListener
 import com.duckduckgo.serp.logos.api.SerpEasterEggLogosToggles
 import com.duckduckgo.serp.logos.api.SerpLogo
-import com.duckduckgo.settings.api.SettingsPageFeature
+import com.duckduckgo.settings.api.SerpSettingsFeature
 import com.duckduckgo.site.permissions.api.SitePermissionsManager
 import com.duckduckgo.site.permissions.api.SitePermissionsManager.LocationPermissionRequest
 import com.duckduckgo.site.permissions.api.SitePermissionsManager.SitePermissionQueryResponse
@@ -495,7 +495,7 @@ class BrowserTabViewModel @Inject constructor(
     private val autoconsentPixelManager: AutoconsentPixelManager,
     private val omnibarRepository: OmnibarRepository,
     private val contentScopeScriptsSubscriptionEventPluginPoint: PluginPoint<ContentScopeScriptsSubscriptionEventPlugin>,
-    private val settingsPageFeature: SettingsPageFeature,
+    private val serpSettingsFeature: SerpSettingsFeature,
 ) : ViewModel(),
     WebViewClientListener,
     EditSavedSiteListener,
@@ -943,7 +943,7 @@ class BrowserTabViewModel @Inject constructor(
             command.value = Command.RefreshOmnibar
         }
 
-        if (settingsPageFeature.serpSettingsSync().isEnabled()) {
+        if (serpSettingsFeature.storeSerpSettings().isEnabled()) {
             viewModelScope.launch {
                 contentScopeScriptsSubscriptionEventPluginPoint.getPlugins().forEach { plugin ->
                     _subscriptionEventDataChannel.send(plugin.getSubscriptionEventData())

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

@@ -24,7 +24,7 @@ import com.duckduckgo.common.utils.AppUrl.ParamKey
 import com.duckduckgo.common.utils.AppUrl.ParamValue
 import com.duckduckgo.duckchat.api.DuckChat
 import com.duckduckgo.experiments.api.VariantManager
-import com.duckduckgo.settings.api.SettingsPageFeature
+import com.duckduckgo.settings.api.SerpSettingsFeature
 import logcat.logcat
 
 interface RequestRewriter {
@@ -40,7 +40,7 @@ class DuckDuckGoRequestRewriter(
     private val appReferrerDataStore: AppReferrerDataStore,
     private val duckChat: DuckChat,
     private val androidConfigFeatures: AndroidBrowserConfigFeature,
-    private val settingsPageFeature: SettingsPageFeature,
+    private val serpSettingsFeature: SerpSettingsFeature,
 ) : RequestRewriter {
 
     private val hideDuckAiSerpKillSwitch by lazy { androidConfigFeatures.hideDuckAiInSerpKillSwitch().isEnabled() }
@@ -82,7 +82,7 @@ class DuckDuckGoRequestRewriter(
         val sourceValue = if (appReferrerDataStore.installedFromEuAuction) ParamValue.SOURCE_EU_AUCTION else ParamValue.SOURCE
 
         builder.appendQueryParameter(ParamKey.HIDE_SERP, ParamValue.HIDE_SERP)
-        if (!settingsPageFeature.serpSettingsSync().isEnabled()) {
+        if (!serpSettingsFeature.storeSerpSettings().isEnabled()) {
             // Once serpSettingsSync feature is permanently enabled this can be removed.
             if (!duckChat.isEnabled() && hideDuckAiSerpKillSwitch) {
                 builder.appendQueryParameter(ParamKey.HIDE_DUCK_AI, ParamValue.HIDE_DUCK_AI)

app/src/main/java/com/duckduckgo/app/browser/di/BrowserModule.kt

@@ -93,7 +93,7 @@ import com.duckduckgo.privacy.config.api.AmpLinks
 import com.duckduckgo.privacy.config.api.Gpc
 import com.duckduckgo.privacy.config.api.TrackingParameters
 import com.duckduckgo.request.filterer.api.RequestFilterer
-import com.duckduckgo.settings.api.SettingsPageFeature
+import com.duckduckgo.settings.api.SerpSettingsFeature
 import com.duckduckgo.subscriptions.api.Subscriptions
 import com.duckduckgo.user.agent.api.UserAgentProvider
 import dagger.Module
@@ -115,7 +115,7 @@ class BrowserModule {
         appReferrerDataStore: AppReferrerDataStore,
         duckChat: DuckChat,
         androidBrowserConfigFeature: AndroidBrowserConfigFeature,
-        settingsPageFeature: SettingsPageFeature,
+        serpSettingsFeature: SerpSettingsFeature,
     ): RequestRewriter {
         return DuckDuckGoRequestRewriter(
             urlDetector,
@@ -124,7 +124,7 @@ class BrowserModule {
             appReferrerDataStore,
             duckChat,
             androidBrowserConfigFeature,
-            settingsPageFeature,
+            serpSettingsFeature,
         )
     }
 

app/src/test/java/com/duckduckgo/app/browser/DuckDuckGoRequestRewriterTest.kt

@@ -30,8 +30,10 @@ import com.duckduckgo.duckchat.api.DuckChat
 import com.duckduckgo.experiments.api.VariantManager
 import com.duckduckgo.feature.toggles.api.FakeFeatureToggleFactory
 import com.duckduckgo.feature.toggles.api.Toggle.State
-import com.duckduckgo.settings.api.SettingsPageFeature
-import org.junit.Assert.*
+import com.duckduckgo.settings.api.SerpSettingsFeature
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -47,7 +49,7 @@ class DuckDuckGoRequestRewriterTest {
     private val mockVariantManager: VariantManager = mock()
     private val mockAppReferrerDataStore: AppReferrerDataStore = mock()
     private val duckChat: DuckChat = mock()
-    private val settingsPageFeature: SettingsPageFeature = FakeFeatureToggleFactory.create(SettingsPageFeature::class.java)
+    private val serpSettingsFeature: SerpSettingsFeature = FakeFeatureToggleFactory.create(SerpSettingsFeature::class.java)
     private val androidBrowserConfigFeature: AndroidBrowserConfigFeature = FakeFeatureToggleFactory.create(AndroidBrowserConfigFeature::class.java)
     private lateinit var builder: Uri.Builder
 
@@ -66,7 +68,7 @@ class DuckDuckGoRequestRewriterTest {
             mockAppReferrerDataStore,
             duckChat,
             androidBrowserConfigFeature,
-            settingsPageFeature,
+            serpSettingsFeature,
         )
         builder = Uri.Builder()
     }
@@ -157,7 +159,7 @@ class DuckDuckGoRequestRewriterTest {
 
     @Test
     fun whenSerpSettingsSyncIsEnabledThenDoNotHideDuckAi() {
-        settingsPageFeature.serpSettingsSync().setRawStoredState(State(true))
+        serpSettingsFeature.storeSerpSettings().setRawStoredState(State(true))
         whenever(duckChat.isEnabled()).thenReturn(false)
         androidBrowserConfigFeature.hideDuckAiInSerpKillSwitch().setRawStoredState(State(true))
 

app/src/test/java/com/duckduckgo/app/browser/QueryUrlConverterTest.kt

@@ -28,8 +28,11 @@ import com.duckduckgo.duckchat.api.DuckChat
 import com.duckduckgo.experiments.api.VariantManager
 import com.duckduckgo.feature.toggles.api.FakeFeatureToggleFactory
 import com.duckduckgo.feature.toggles.api.Toggle.State
-import com.duckduckgo.settings.api.SettingsPageFeature
-import org.junit.Assert.*
+import com.duckduckgo.settings.api.SerpSettingsFeature
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -44,7 +47,7 @@ class QueryUrlConverterTest {
     private val mockAppReferrerDataStore: AppReferrerDataStore = mock()
     private val duckChat: DuckChat = mock()
     private val androidBrowserConfigFeature: AndroidBrowserConfigFeature = FakeFeatureToggleFactory.create(AndroidBrowserConfigFeature::class.java)
-    private val settingsPageFeature: SettingsPageFeature = FakeFeatureToggleFactory.create(SettingsPageFeature::class.java)
+    private val serpSettingsFeature: SerpSettingsFeature = FakeFeatureToggleFactory.create(SerpSettingsFeature::class.java)
     private val requestRewriter =
         DuckDuckGoRequestRewriter(
             DuckDuckGoUrlDetectorImpl(),
@@ -53,7 +56,7 @@ class QueryUrlConverterTest {
             mockAppReferrerDataStore,
             duckChat,
             androidBrowserConfigFeature,
-            settingsPageFeature,
+            serpSettingsFeature,
         )
     private val testee: QueryUrlConverter = QueryUrlConverter(requestRewriter)
 

duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/feature/DuckChatFeature.kt

@@ -116,4 +116,10 @@ interface DuckChatFeature {
      */
     @Toggle.DefaultValue(DefaultFeatureValue.INTERNAL)
     fun duckAiVoiceSearch(): Toggle
+
+    /**
+     * @return `true` when the "Hide AI Generated Images" option should be visible in AI Features Settings.
+     */
+    @Toggle.DefaultValue(DefaultFeatureValue.INTERNAL)
+    fun showHideAiGeneratedImages(): Toggle
 }

duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/messaging/IsNativeDuckAiEnabledHandler.kt

@@ -27,7 +27,7 @@ import com.duckduckgo.js.messaging.api.JsMessage
 import com.duckduckgo.js.messaging.api.JsMessageCallback
 import com.duckduckgo.js.messaging.api.JsMessageHandler
 import com.duckduckgo.js.messaging.api.JsMessaging
-import com.duckduckgo.settings.api.SettingsPageFeature
+import com.duckduckgo.settings.api.SerpSettingsFeature
 import com.squareup.anvil.annotations.ContributesMultibinding
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -45,7 +45,7 @@ import javax.inject.Inject
 class IsNativeDuckAiEnabledHandler @Inject constructor(
     private val dispatcherProvider: DispatcherProvider,
     @AppCoroutineScope private val appScope: CoroutineScope,
-    private val settingsPageFeature: SettingsPageFeature,
+    private val serpSettingsFeature: SerpSettingsFeature,
     private val duckChat: DuckChat,
 ) : ContentScopeJsMessageHandlersPlugin {
 
@@ -57,7 +57,7 @@ class IsNativeDuckAiEnabledHandler @Inject constructor(
                 jsMessageCallback: JsMessageCallback?,
             ) {
                 appScope.launch(dispatcherProvider.main()) {
-                    if (settingsPageFeature.serpSettingsSync().isEnabled()) {
+                    if (serpSettingsFeature.storeSerpSettings().isEnabled()) {
                         logcat { "SERP-SETTINGS: IsNativeDuckAiEnabledHandler processing message" }
                         val response = JSONObject().apply {
                             put("enabled", duckChat.isEnabled())

duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModel.kt

@@ -25,6 +25,7 @@ import com.duckduckgo.duckchat.api.DuckChatNativeSettingsNoParams
 import com.duckduckgo.duckchat.api.DuckChatSettingsNoParams
 import com.duckduckgo.duckchat.impl.DuckChatInternal
 import com.duckduckgo.duckchat.impl.R
+import com.duckduckgo.duckchat.impl.feature.DuckChatFeature
 import com.duckduckgo.duckchat.impl.inputscreen.ui.metrics.discovery.InputScreenDiscoveryFunnel
 import com.duckduckgo.duckchat.impl.pixel.DuckChatPixelName
 import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenLink
@@ -53,6 +54,7 @@ class DuckChatSettingsViewModel @AssistedInject constructor(
     private val inputScreenDiscoveryFunnel: InputScreenDiscoveryFunnel,
     private val settingsPageFeature: SettingsPageFeature,
     private val dispatcherProvider: DispatcherProvider,
+    private val duckChatFeature: DuckChatFeature,
 ) : ViewModel() {
     private val commandChannel = Channel<Command>(capacity = 1, onBufferOverflow = DROP_OLDEST)
     val commands = commandChannel.receiveAsFlow()
@@ -73,15 +75,15 @@ class DuckChatSettingsViewModel @AssistedInject constructor(
             duckChat.observeEnableDuckChatUserSetting(),
             duckChat.observeInputScreenUserSettingEnabled(),
             duckChat.observeFullscreenModeUserSetting(),
-            flowOf(settingsPageFeature.hideAiGeneratedImagesOption().isEnabled()).flowOn(dispatcherProvider.io()),
-        ) { isDuckChatUserEnabled, isInputScreenEnabled, isFullScreenModeEnabled, isHideAiGeneratedImagesOptionVisible ->
+            flowOf(duckChatFeature.showHideAiGeneratedImages().isEnabled()).flowOn(dispatcherProvider.io()),
+        ) { isDuckChatUserEnabled, isInputScreenEnabled, isFullScreenModeEnabled, showHideAiGeneratedImagesOption ->
             ViewState(
                 isDuckChatUserEnabled = isDuckChatUserEnabled,
                 isInputScreenEnabled = isInputScreenEnabled,
                 shouldShowShortcuts = isDuckChatUserEnabled,
                 shouldShowInputScreenToggle = isDuckChatUserEnabled && duckChat.isInputScreenFeatureAvailable(),
                 isSearchSectionVisible = isSearchSectionVisible(duckChatActivityParams),
-                isHideGeneratedImagesOptionVisible = isHideAiGeneratedImagesOptionVisible,
+                isHideGeneratedImagesOptionVisible = showHideAiGeneratedImagesOption,
                 shouldShowFullScreenModeToggle = duckChat.isDuckChatFullScreenModeFeatureAvailable(),
                 isFullScreenModeEnabled = isFullScreenModeEnabled,
             )
@@ -143,19 +145,19 @@ class DuckChatSettingsViewModel @AssistedInject constructor(
 
     fun duckChatSearchAISettingsClicked() {
         viewModelScope.launch {
-            val hideAiGeneratedImagesOptionEnabled = withContext(dispatcherProvider.io()) {
-                settingsPageFeature.hideAiGeneratedImagesOption().isEnabled()
+            val showHideAiGeneratedImages = withContext(dispatcherProvider.io()) {
+                duckChatFeature.showHideAiGeneratedImages().isEnabled()
             }
 
             if (settingsPageFeature.embeddedSettingsWebView().isEnabled()) {
                 commandChannel.send(
                     OpenLink(
-                        link = if (hideAiGeneratedImagesOptionEnabled) {
+                        link = if (showHideAiGeneratedImages) {
                             DUCK_CHAT_SEARCH_AI_SETTINGS_LINK_EMBEDDED
                         } else {
                             LEGACY_DUCK_CHAT_SEARCH_AI_SETTINGS_LINK_EMBEDDED
                         },
-                        titleRes = if (hideAiGeneratedImagesOptionEnabled) {
+                        titleRes = if (showHideAiGeneratedImages) {
                             R.string.duckAiSerpSettingsTitle
                         } else {
                             R.string.duck_chat_assist_settings_title

duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/messaging/IsNativeDuckAiEnabledHandlerTest.kt

@@ -23,7 +23,7 @@ import com.duckduckgo.duckchat.impl.messaging.fakes.FakeJsMessaging
 import com.duckduckgo.feature.toggles.api.FakeFeatureToggleFactory
 import com.duckduckgo.feature.toggles.api.Toggle
 import com.duckduckgo.js.messaging.api.JsMessage
-import com.duckduckgo.settings.api.SettingsPageFeature
+import com.duckduckgo.settings.api.SerpSettingsFeature
 import kotlinx.coroutines.test.runTest
 import org.json.JSONObject
 import org.junit.Assert.assertEquals
@@ -39,15 +39,15 @@ class IsNativeDuckAiEnabledHandlerTest {
     val coroutineTestRule: CoroutineTestRule = CoroutineTestRule()
 
     private val fakeDuckChat = FakeDuckChat(enabled = true)
-    private val settingsPageFeature = FakeFeatureToggleFactory.create(SettingsPageFeature::class.java)
+    private val serpSettingsFeature = FakeFeatureToggleFactory.create(SerpSettingsFeature::class.java)
     private lateinit var handler: IsNativeDuckAiEnabledHandler
 
     @Before
     fun setUp() {
         handler = IsNativeDuckAiEnabledHandler(
             dispatcherProvider = coroutineTestRule.testDispatcherProvider,
             appScope = coroutineTestRule.testScope,
-            settingsPageFeature = settingsPageFeature,
+            serpSettingsFeature = serpSettingsFeature,
             duckChat = fakeDuckChat,
         )
     }
@@ -74,7 +74,7 @@ class IsNativeDuckAiEnabledHandlerTest {
     @Test
     fun `when id is null then no response is sent`() = runTest {
         @Suppress("DenyListedApi")
-        settingsPageFeature.serpSettingsSync().setRawStoredState(Toggle.State(enable = true))
+        serpSettingsFeature.storeSerpSettings().setRawStoredState(Toggle.State(enable = true))
         fakeDuckChat.setEnabled(true)
 
         val fakeJsMessaging = FakeJsMessaging()
@@ -96,7 +96,7 @@ class IsNativeDuckAiEnabledHandlerTest {
     @Test
     fun `when id is not null then response is sent`() = runTest {
         @Suppress("DenyListedApi")
-        settingsPageFeature.serpSettingsSync().setRawStoredState(Toggle.State(enable = true))
+        serpSettingsFeature.storeSerpSettings().setRawStoredState(Toggle.State(enable = true))
         fakeDuckChat.setEnabled(true)
 
         val fakeJsMessaging = FakeJsMessaging()