Save and Exit: Query params (#6891)

0nko · web-flow · commit 010155add955 · 2025-10-08T14:51:15.000+02:00
Task/Issue URL: https://app.asana.com/1/137249556945/project/1207418217763355/task/1211526840351072?focus=true ### Description This PR modifies the settings links and adds query parameter to display the embedded version of the SERP settings. ### Steps to test this PR _Private Search_ - [x] Go to Settings -> Private Search - [x] Tap on the More Search Settings - [x] Verify the SERP settings are scrolled to the appropriate private search section - [x] Verify that the webpage is displayed without Save and Exit button and the search box at the top _AI Features_ - [x] Go to Settings -> AI Features - [x] Tap on the Search Assist Settings - [x] Verify the SERP settings are scrolled to the appropriate Duck.ai settings - [x] Verify that the webpage is displayed without Save and Exit button and the search box at the top
diff --git a/app/src/main/java/com/duckduckgo/app/privatesearch/PrivateSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/privatesearch/PrivateSearchActivity.kt
@@ -113,11 +113,11 @@ class PrivateSearchActivity : DuckDuckGoActivity() {
     }
 
     private fun launchCustomizeSearchWebPage() {
-        if (settingsPageFeature.saveAndExitSerpSettings().isEnabled()) {
+        if (settingsPageFeature.embeddedSettingsWebView().isEnabled()) {
             globalActivityStarter.start(
                 this,
                 SettingsWebViewScreenWithParams(
-                    url = DUCKDUCKGO_SETTINGS_WEB_LINK_WITH_RETURN_PARAM,
+                    url = DUCKDUCKGO_SETTINGS_WEB_LINK_EMBEDDED,
                     getString(R.string.privateSearchMoreSearchSettingsTitle),
                 ),
             )
@@ -134,6 +134,6 @@ class PrivateSearchActivity : DuckDuckGoActivity() {
 
     companion object {
         private const val DUCKDUCKGO_SETTINGS_WEB_LINK = "https://duckduckgo.com/settings"
-        private const val DUCKDUCKGO_SETTINGS_WEB_LINK_WITH_RETURN_PARAM = "https://duckduckgo.com/settings?ko=-1&return=privateSearch"
+        private const val DUCKDUCKGO_SETTINGS_WEB_LINK_EMBEDDED = "https://duckduckgo.com/settings?ko=-1&embedded=1#general"
     }
 }
diff --git a/content-scope-scripts/content-scope-scripts-api/src/main/java/com/duckduckgo/contentscopescripts/api/CoreContentScopeScripts.kt b/content-scope-scripts/content-scope-scripts-api/src/main/java/com/duckduckgo/contentscopescripts/api/CoreContentScopeScripts.kt
diff --git a/content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/ContentScopeScriptsJsInjectorPlugin.kt b/content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/ContentScopeScriptsJsInjectorPlugin.kt
@@ -19,7 +19,6 @@ package com.duckduckgo.contentscopescripts.impl
 import android.webkit.WebView
 import com.duckduckgo.app.global.model.Site
 import com.duckduckgo.browser.api.JsInjectorPlugin
-import com.duckduckgo.contentscopescripts.api.CoreContentScopeScripts
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.feature.toggles.api.Toggle
 import com.squareup.anvil.annotations.ContributesMultibinding
diff --git a/content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/RealContentScopeScripts.kt b/content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/RealContentScopeScripts.kt
@@ -21,7 +21,6 @@ import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.appbuildconfig.api.isInternalBuild
 import com.duckduckgo.common.utils.plugins.PluginPoint
 import com.duckduckgo.contentscopescripts.api.ContentScopeConfigPlugin
-import com.duckduckgo.contentscopescripts.api.CoreContentScopeScripts
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.feature.toggles.api.FeatureException
 import com.duckduckgo.feature.toggles.api.Toggle
@@ -38,6 +37,19 @@ import java.util.UUID
 import java.util.concurrent.CopyOnWriteArrayList
 import javax.inject.Inject
 
+interface CoreContentScopeScripts {
+    fun getScript(
+        isDesktopMode: Boolean?,
+        activeExperiments: List<Toggle>,
+    ): String
+
+    fun isEnabled(): Boolean
+
+    val secret: String
+    val javascriptInterface: String
+    val callbackName: String
+}
+
 @SingleInstanceIn(AppScope::class)
 @ContributesBinding(AppScope::class)
 class RealContentScopeScripts @Inject constructor(
diff --git a/content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsJsMessaging.kt b/content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsJsMessaging.kt
@@ -22,7 +22,7 @@ import androidx.core.net.toUri
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.common.utils.plugins.PluginPoint
 import com.duckduckgo.contentscopescripts.api.ContentScopeJsMessageHandlersPlugin
-import com.duckduckgo.contentscopescripts.api.CoreContentScopeScripts
+import com.duckduckgo.contentscopescripts.impl.CoreContentScopeScripts
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.js.messaging.api.JsCallbackData
 import com.duckduckgo.js.messaging.api.JsMessage
diff --git a/content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsPostMessageWrapperPlugin.kt b/content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsPostMessageWrapperPlugin.kt
@@ -18,7 +18,7 @@ package com.duckduckgo.contentscopescripts.impl.messaging
 
 import android.annotation.SuppressLint
 import android.webkit.WebView
-import com.duckduckgo.contentscopescripts.api.CoreContentScopeScripts
+import com.duckduckgo.contentscopescripts.impl.CoreContentScopeScripts
 import com.duckduckgo.contentscopescripts.impl.WebViewCompatContentScopeScripts
 import com.duckduckgo.di.scopes.FragmentScope
 import com.duckduckgo.js.messaging.api.JsMessageHelper
diff --git a/content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/ContentScopeScriptsJsInjectorPluginTest.kt b/content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/ContentScopeScriptsJsInjectorPluginTest.kt
@@ -1,7 +1,6 @@
 package com.duckduckgo.contentscopescripts.impl
 
 import android.webkit.WebView
-import com.duckduckgo.contentscopescripts.api.CoreContentScopeScripts
 import org.junit.Before
 import org.junit.Test
 import org.mockito.kotlin.any
diff --git a/content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/RealContentScopeScriptsTest.kt b/content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/RealContentScopeScriptsTest.kt
@@ -22,7 +22,6 @@ import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.appbuildconfig.api.BuildFlavor
 import com.duckduckgo.common.utils.plugins.PluginPoint
 import com.duckduckgo.contentscopescripts.api.ContentScopeConfigPlugin
-import com.duckduckgo.contentscopescripts.api.CoreContentScopeScripts
 import com.duckduckgo.feature.toggles.api.FakeFeatureToggleFactory
 import com.duckduckgo.feature.toggles.api.FeatureException
 import com.duckduckgo.feature.toggles.api.Toggle
diff --git a/content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsJsMessagingTest.kt b/content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsJsMessagingTest.kt
@@ -21,7 +21,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.common.utils.plugins.PluginPoint
 import com.duckduckgo.contentscopescripts.api.ContentScopeJsMessageHandlersPlugin
-import com.duckduckgo.contentscopescripts.api.CoreContentScopeScripts
+import com.duckduckgo.contentscopescripts.impl.CoreContentScopeScripts
 import com.duckduckgo.js.messaging.api.JsMessage
 import com.duckduckgo.js.messaging.api.JsMessageCallback
 import com.duckduckgo.js.messaging.api.JsMessageHandler
diff --git a/content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsPostMessageWrapperPluginTest.kt b/content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsPostMessageWrapperPluginTest.kt
@@ -1,7 +1,7 @@
 package com.duckduckgo.contentscopescripts.impl.messaging
 
 import android.webkit.WebView
-import com.duckduckgo.contentscopescripts.api.CoreContentScopeScripts
+import com.duckduckgo.contentscopescripts.impl.CoreContentScopeScripts
 import com.duckduckgo.contentscopescripts.impl.WebViewCompatContentScopeScripts
 import com.duckduckgo.js.messaging.api.JsMessageHelper
 import com.duckduckgo.js.messaging.api.SubscriptionEvent
diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsActivity.kt
@@ -210,7 +210,7 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
     private fun processCommand(command: DuckChatSettingsViewModel.Command) {
         when (command) {
             is DuckChatSettingsViewModel.Command.OpenLink -> {
-                if (settingsPageFeature.saveAndExitSerpSettings().isEnabled()) {
+                if (settingsPageFeature.embeddedSettingsWebView().isEnabled()) {
                     globalActivityStarter.start(
                         this,
                         SettingsWebViewScreenWithParams(
diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModel.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModel.kt
@@ -29,7 +29,6 @@ import com.duckduckgo.duckchat.impl.pixel.DuckChatPixelName
 import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenLink
 import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenLinkInNewTab
 import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.Command.OpenShortcutSettings
-import com.duckduckgo.settings.api.SettingsConstants
 import com.duckduckgo.settings.api.SettingsPageFeature
 import com.duckduckgo.subscriptions.api.SubscriptionRebrandingFeatureToggle
 import kotlinx.coroutines.channels.BufferOverflow.DROP_OLDEST
@@ -130,11 +129,11 @@ class DuckChatSettingsViewModel @Inject constructor(
 
     fun duckChatSearchAISettingsClicked() {
         viewModelScope.launch {
-            if (settingsPageFeature.saveAndExitSerpSettings().isEnabled()) {
+            if (settingsPageFeature.embeddedSettingsWebView().isEnabled()) {
                 commandChannel.send(
                     OpenLink(
-                        DUCK_CHAT_SEARCH_AI_SETTINGS_LINK_WITH_RETURN_PARAM,
-                        R.string.duck_chat_search_assist_settings_title,
+                        DUCK_CHAT_SEARCH_AI_SETTINGS_LINK_EMBEDDED,
+                        R.string.duck_chat_assist_settings_title_rebranding,
                     ),
                 )
             } else {
@@ -175,8 +174,6 @@ class DuckChatSettingsViewModel @Inject constructor(
     companion object {
         const val DUCK_CHAT_LEARN_MORE_LINK = "https://duckduckgo.com/duckduckgo-help-pages/aichat/"
         const val DUCK_CHAT_SEARCH_AI_SETTINGS_LINK = "https://duckduckgo.com/settings?ko=-1#aifeatures"
-        const val DUCK_CHAT_SEARCH_AI_SETTINGS_LINK_WITH_RETURN_PARAM =
-            "https://duckduckgo.com/settings?ko=-1&return=" +
-                "${SettingsConstants.ID_AI_FEATURES}#aifeatures"
+        const val DUCK_CHAT_SEARCH_AI_SETTINGS_LINK_EMBEDDED = "https://duckduckgo.com/settings?ko=-1&embedded=1&highlight=kbe#aifeatures"
     }
 }
diff --git a/duckchat/duckchat-impl/src/main/res/values/donottranslate.xml b/duckchat/duckchat-impl/src/main/res/values/donottranslate.xml
diff --git a/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModelTest.kt b/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/settings/DuckChatSettingsViewModelTest.kt
@@ -60,7 +60,7 @@ class DuckChatSettingsViewModelTest {
     fun setUp() =
         runTest {
             @Suppress("DenyListedApi")
-            settingsPageFeature.saveAndExitSerpSettings().setRawStoredState(State(enable = false))
+            settingsPageFeature.embeddedSettingsWebView().setRawStoredState(State(enable = false))
             whenever(duckChat.observeEnableDuckChatUserSetting()).thenReturn(flowOf(true))
             whenever(duckChat.observeShowInBrowserMenuUserSetting()).thenReturn(flowOf(false))
             whenever(duckChat.observeShowInAddressBarUserSetting()).thenReturn(flowOf(false))
@@ -244,7 +244,7 @@ class DuckChatSettingsViewModelTest {
     fun whenDuckChatSearchAISettingsClickedAndSaveAndExitEnabledThenOpenSettingsLinkWithReturnParamEmitted() =
         runTest {
             @Suppress("DenyListedApi")
-            settingsPageFeature.saveAndExitSerpSettings().setRawStoredState(State(enable = true))
+            settingsPageFeature.embeddedSettingsWebView().setRawStoredState(State(enable = true))
 
             testee.duckChatSearchAISettingsClicked()
 
@@ -253,10 +253,10 @@ class DuckChatSettingsViewModelTest {
                 assertTrue(command is OpenLink)
                 command as OpenLink
                 assertEquals(
-                    DuckChatSettingsViewModel.DUCK_CHAT_SEARCH_AI_SETTINGS_LINK_WITH_RETURN_PARAM,
+                    DuckChatSettingsViewModel.DUCK_CHAT_SEARCH_AI_SETTINGS_LINK_EMBEDDED,
                     command.link,
                 )
-                assertEquals(R.string.duck_chat_search_assist_settings_title, command.titleRes)
+                assertEquals(R.string.duck_chat_assist_settings_title_rebranding, command.titleRes)
                 cancelAndIgnoreRemainingEvents()
             }
         }
diff --git a/settings/settings-api/src/main/java/com/duckduckgo/settings/api/SettingsConstants.kt b/settings/settings-api/src/main/java/com/duckduckgo/settings/api/SettingsConstants.kt
diff --git a/settings/settings-api/src/main/java/com/duckduckgo/settings/api/SettingsPageFeature.kt b/settings/settings-api/src/main/java/com/duckduckgo/settings/api/SettingsPageFeature.kt
@@ -29,5 +29,5 @@ interface SettingsPageFeature {
 
     @Toggle.DefaultValue(DefaultFeatureValue.FALSE)
     @Toggle.InternalAlwaysEnabled
-    fun saveAndExitSerpSettings(): Toggle
+    fun embeddedSettingsWebView(): Toggle
 }
diff --git a/settings/settings-impl/build.gradle b/settings/settings-impl/build.gradle
@@ -43,7 +43,6 @@ dependencies {
     implementation project(':browser-api')
     implementation project(':design-system')
     implementation project(':navigation-api')
-    implementation project(':user-agent-api')
     implementation project(':settings-api')
     implementation project(':common-utils')
     implementation project(':js-messaging-api')
diff --git a/settings/settings-impl/src/main/java/com/duckduckgo/settings/impl/SettingsWebViewActivity.kt b/settings/settings-impl/src/main/java/com/duckduckgo/settings/impl/SettingsWebViewActivity.kt
@@ -27,41 +27,27 @@ import androidx.lifecycle.lifecycleScope
 import com.duckduckgo.anvil.annotations.ContributeToActivityStarter
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.statistics.pixels.Pixel
-import com.duckduckgo.browser.api.webviewcompat.WebViewCompatWrapper
 import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.common.ui.viewbinding.viewBinding
-import com.duckduckgo.contentscopescripts.api.CoreContentScopeScripts
 import com.duckduckgo.di.scopes.ActivityScope
-import com.duckduckgo.js.messaging.api.JsMessageCallback
 import com.duckduckgo.js.messaging.api.JsMessaging
 import com.duckduckgo.navigation.api.getActivityParams
 import com.duckduckgo.settings.api.SettingsWebViewScreenWithParams
 import com.duckduckgo.settings.impl.databinding.ActivitySettingsWebviewBinding
-import com.duckduckgo.user.agent.api.UserAgentProvider
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import org.json.JSONObject
 import javax.inject.Inject
 import javax.inject.Named
 
 @InjectWith(ActivityScope::class)
 @ContributeToActivityStarter(SettingsWebViewScreenWithParams::class)
 class SettingsWebViewActivity : DuckDuckGoActivity() {
-    @Inject
-    lateinit var userAgentProvider: UserAgentProvider
-
-    @Inject
-    lateinit var webViewCompat: WebViewCompatWrapper
-
     @Inject
     lateinit var pixel: Pixel
 
     private val viewModel: SettingsWebViewViewModel by bindViewModel()
 
-    @Inject
-    lateinit var css: CoreContentScopeScripts
-
     @Inject
     @Named("ContentScopeScripts")
     lateinit var contentScopeScripts: JsMessaging
@@ -122,41 +108,17 @@ class SettingsWebViewActivity : DuckDuckGoActivity() {
 
     private fun exit() {
         binding.settingsWebView.stopLoading()
-        binding.settingsWebView.removeJavascriptInterface(contentScopeScripts.context)
         binding.root.removeView(binding.settingsWebView)
         binding.settingsWebView.destroy()
 
         finish()
     }
 
     @SuppressLint("SetJavaScriptEnabled")
-    private suspend fun setupWebView() {
+    private fun setupWebView() {
         binding.settingsWebView.let {
-            contentScopeScripts.register(
-                it,
-                object : JsMessageCallback() {
-                    override fun process(
-                        featureName: String,
-                        method: String,
-                        id: String?,
-                        data: JSONObject?,
-                    ) {
-                        viewModel.processJsCallbackMessage(featureName, method, id, data)
-                    }
-                },
-            )
-
-            webViewCompat.addDocumentStartJavaScript(
-                it,
-                "javascript:${css.getScript(false, emptyList())}",
-                setOf(
-                    "https://duckduckgo.com", // exact origin
-                    "https://*.duckduckgo.com", // any subdomain
-                ),
-            )
-
             it.settings.apply {
-                userAgentString = userAgentProvider.userAgent()
+                userAgentString = CUSTOM_USER_AGENT
                 javaScriptEnabled = true
                 domStorageEnabled = true
                 loadWithOverviewMode = true
@@ -179,4 +141,9 @@ class SettingsWebViewActivity : DuckDuckGoActivity() {
         }
         return super.onOptionsItemSelected(item)
     }
+
+    companion object {
+        private const val CUSTOM_USER_AGENT = "Mozilla/5.0 (Linux; Android 15) AppleWebKit/537.36 (KHTML, like Gecko) " +
+            "Version/4.0 Chrome/140.0.0.0 Mobile DuckDuckGo/5 Safari/537.36"
+    }
 }
diff --git a/settings/settings-impl/src/main/java/com/duckduckgo/settings/impl/SettingsWebViewViewModel.kt b/settings/settings-impl/src/main/java/com/duckduckgo/settings/impl/SettingsWebViewViewModel.kt
diff --git a/settings/settings-impl/src/main/java/com/duckduckgo/settings/impl/messaging/SettingsContentScopeJsMessageHandler.kt b/settings/settings-impl/src/main/java/com/duckduckgo/settings/impl/messaging/SettingsContentScopeJsMessageHandler.kt
diff --git a/settings/settings-impl/src/test/java/com/duckduckgo/settings/impl/SettingsWebViewViewModelTest.kt b/settings/settings-impl/src/test/java/com/duckduckgo/settings/impl/SettingsWebViewViewModelTest.kt

Original file line number	Diff line number	Diff line change
`@@ -113,11 +113,11 @@ class PrivateSearchActivity : DuckDuckGoActivity() {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`private fun launchCustomizeSearchWebPage() {`
`116`		`- if (settingsPageFeature.saveAndExitSerpSettings().isEnabled()) {`
	`116`	`+ if (settingsPageFeature.embeddedSettingsWebView().isEnabled()) {`
`117`	`117`	`globalActivityStarter.start(`
`118`	`118`	`this,`
`119`	`119`	`SettingsWebViewScreenWithParams(`
`120`		`- url = DUCKDUCKGO_SETTINGS_WEB_LINK_WITH_RETURN_PARAM,`
	`120`	`+ url = DUCKDUCKGO_SETTINGS_WEB_LINK_EMBEDDED,`
`121`	`121`	`getString(R.string.privateSearchMoreSearchSettingsTitle),`
`122`	`122`	`),`
`123`	`123`	`)`
`@@ -134,6 +134,6 @@ class PrivateSearchActivity : DuckDuckGoActivity() {`
`134`	`134`
`135`	`135`	`companion object {`
`136`	`136`	`private const val DUCKDUCKGO_SETTINGS_WEB_LINK = "https://duckduckgo.com/settings"`
`137`		`- private const val DUCKDUCKGO_SETTINGS_WEB_LINK_WITH_RETURN_PARAM = "https://duckduckgo.com/settings?ko=-1&return=privateSearch"`
	`137`	`+ private const val DUCKDUCKGO_SETTINGS_WEB_LINK_EMBEDDED = "https://duckduckgo.com/settings?ko=-1&embedded=1#general"`
`138`	`138`	`}`
`139`	`139`	`}`