Fix issues after rebasing

CrisBarreiro · CrisBarreiro · commit 9c5603e83530 · 2025-10-01T18:21:17.000+02:00
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
@@ -207,6 +207,7 @@ import com.duckduckgo.autofill.api.passwordgeneration.AutomaticSavedLoginsMonito
 import com.duckduckgo.autofill.impl.AutofillFireproofDialogSuppressor
 import com.duckduckgo.brokensite.api.BrokenSitePrompt
 import com.duckduckgo.brokensite.api.RefreshPattern
+import com.duckduckgo.browser.api.AddDocumentStartJavaScriptBrowserPlugin
 import com.duckduckgo.browser.api.UserBrowserProperties
 import com.duckduckgo.browser.api.autocomplete.AutoComplete
 import com.duckduckgo.browser.api.autocomplete.AutoComplete.AutoCompleteSuggestion.AutoCompleteDefaultSuggestion
@@ -254,7 +255,7 @@ import com.duckduckgo.feature.toggles.api.Toggle
 import com.duckduckgo.feature.toggles.api.Toggle.State
 import com.duckduckgo.history.api.HistoryEntry.VisitedPage
 import com.duckduckgo.history.api.NavigationHistory
-import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScriptPlugin
+import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScript
 import com.duckduckgo.js.messaging.api.JsCallbackData
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed.MALWARE
@@ -7452,11 +7453,11 @@ class BrowserTabViewModelTest {
 
     @Test
     fun whenConfigureWebViewThenCallAddDocumentStartJavaScript() {
-        assertEquals(0, fakeAddDocumentStartJavaScriptPlugins.plugin.countInitted)
+        assertEquals(0, fakeAddDocumentStartJavaScriptPlugins.plugin.addDocumentStartJavaScript().countInitted)
 
         testee.addDocumentStartJavaScript(mockWebView)
 
-        assertEquals(1, fakeAddDocumentStartJavaScriptPlugins.plugin.countInitted)
+        assertEquals(1, fakeAddDocumentStartJavaScriptPlugins.plugin.addDocumentStartJavaScript().countInitted)
     }
 
     private fun aCredential(): LoginCredentials = LoginCredentials(domain = null, username = null, password = null)
@@ -7746,7 +7747,13 @@ class BrowserTabViewModelTest {
         override fun getCustomHeaders(url: String): Map<String, String> = headers
     }
 
-    class FakeAddDocumentStartJavaScriptPlugin : AddDocumentStartJavaScriptPlugin {
+    class FakeAddDocumentStartJavaScriptBrowserPlugin : AddDocumentStartJavaScriptBrowserPlugin {
+        private val addDocumentStartJavaScript = FakeAddDocumentStartJavaScript()
+
+        override fun addDocumentStartJavaScript(): FakeAddDocumentStartJavaScript = addDocumentStartJavaScript
+    }
+
+    class FakeAddDocumentStartJavaScript : AddDocumentStartJavaScript {
         var countInitted = 0
             private set
 
@@ -7755,8 +7762,8 @@ class BrowserTabViewModelTest {
         }
     }
 
-    class FakeAddDocumentStartJavaScriptPluginPoint : PluginPoint<AddDocumentStartJavaScriptPlugin> {
-        val plugin = FakeAddDocumentStartJavaScriptPlugin()
+    class FakeAddDocumentStartJavaScriptPluginPoint : PluginPoint<AddDocumentStartJavaScriptBrowserPlugin> {
+        val plugin = FakeAddDocumentStartJavaScriptBrowserPlugin()
 
         override fun getPlugins() = listOf(plugin)
     }
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserWebViewClientTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserWebViewClientTest.kt
@@ -67,7 +67,6 @@ import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.autoconsent.api.Autoconsent
 import com.duckduckgo.autofill.api.BrowserAutofill
 import com.duckduckgo.autofill.api.InternalTestUserChecker
-import com.duckduckgo.browser.api.AddDocumentStartJavaScriptPlugin
 import com.duckduckgo.browser.api.JsInjectorPlugin
 import com.duckduckgo.browser.api.WebViewVersionProvider
 import com.duckduckgo.common.test.CoroutineTestRule
@@ -85,7 +84,6 @@ import com.duckduckgo.duckplayer.api.DuckPlayer.OpenDuckPlayerInNewTab.On
 import com.duckduckgo.duckplayer.api.DuckPlayer.OpenDuckPlayerInNewTab.Unavailable
 import com.duckduckgo.feature.toggles.api.Toggle
 import com.duckduckgo.history.api.NavigationHistory
-import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScript
 import com.duckduckgo.js.messaging.api.PostMessageWrapperPlugin
 import com.duckduckgo.js.messaging.api.SubscriptionEventData
 import com.duckduckgo.js.messaging.api.WebMessagingPlugin
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -274,6 +274,7 @@ import com.duckduckgo.autofill.api.passwordgeneration.AutomaticSavedLoginsMonito
 import com.duckduckgo.autofill.impl.AutofillFireproofDialogSuppressor
 import com.duckduckgo.brokensite.api.BrokenSitePrompt
 import com.duckduckgo.brokensite.api.RefreshPattern
+import com.duckduckgo.browser.api.AddDocumentStartJavaScriptBrowserPlugin
 import com.duckduckgo.browser.api.UserBrowserProperties
 import com.duckduckgo.browser.api.autocomplete.AutoComplete
 import com.duckduckgo.browser.api.autocomplete.AutoComplete.AutoCompleteResult
@@ -319,7 +320,6 @@ import com.duckduckgo.duckplayer.api.DuckPlayer
 import com.duckduckgo.duckplayer.api.DuckPlayer.DuckPlayerState.ENABLED
 import com.duckduckgo.feature.toggles.api.Toggle
 import com.duckduckgo.history.api.NavigationHistory
-import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScriptPlugin
 import com.duckduckgo.js.messaging.api.JsCallbackData
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed.MALWARE
@@ -485,7 +485,7 @@ class BrowserTabViewModel @Inject constructor(
     private val externalIntentProcessingState: ExternalIntentProcessingState,
     private val vpnMenuStateProvider: VpnMenuStateProvider,
     private val webViewCompatWrapper: WebViewCompatWrapper,
-    private val addDocumentStartJavascriptPlugins: PluginPoint<AddDocumentStartJavaScriptPlugin>,
+    private val addDocumentStartJavascriptPlugins: PluginPoint<AddDocumentStartJavaScriptBrowserPlugin>,
 ) : ViewModel(),
     WebViewClientListener,
     EditSavedSiteListener,
@@ -4211,9 +4211,7 @@ class BrowserTabViewModel @Inject constructor(
     override fun addDocumentStartJavaScript(webView: WebView) {
         viewModelScope.launch {
             addDocumentStartJavascriptPlugins.getPlugins().forEach {
-                it.addDocumentStartJavaScript(
-                    webView,
-                )
+                it.addDocumentStartJavaScript().addDocumentStartJavaScript(webView)
             }
         }
     }
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt
@@ -65,7 +65,6 @@ import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.autoconsent.api.Autoconsent
 import com.duckduckgo.autofill.api.BrowserAutofill
 import com.duckduckgo.autofill.api.InternalTestUserChecker
-import com.duckduckgo.browser.api.AddDocumentStartJavaScriptPlugin
 import com.duckduckgo.browser.api.JsInjectorPlugin
 import com.duckduckgo.common.utils.AppUrl.ParamKey.QUERY
 import com.duckduckgo.common.utils.CurrentTimeProvider
diff --git a/app/src/main/java/com/duckduckgo/app/browser/ContentScopeScriptsAddDocumentStartJavaScriptBrowserPlugin.kt b/app/src/main/java/com/duckduckgo/app/browser/ContentScopeScriptsAddDocumentStartJavaScriptBrowserPlugin.kt
@@ -16,18 +16,16 @@
 
 package com.duckduckgo.app.browser
 
-import com.duckduckgo.browser.api.AddDocumentStartJavaScriptPlugin
+import com.duckduckgo.browser.api.AddDocumentStartJavaScriptBrowserPlugin
 import com.duckduckgo.contentscopescripts.impl.ContentScopeScriptsAddDocumentStartJavaScript
 import com.duckduckgo.di.scopes.FragmentScope
 import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScript
 import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject
 
 @ContributesMultibinding(FragmentScope::class)
-class ContentScopeScriptsAddDocumentStartJavaScriptPlugin @Inject constructor(
+class ContentScopeScriptsAddDocumentStartJavaScriptBrowserPlugin @Inject constructor(
     private val contentScopeScriptsAddDocumentStartJavaScript: ContentScopeScriptsAddDocumentStartJavaScript,
-) : AddDocumentStartJavaScriptPlugin {
-    override fun addDocumentStartJavaScript(): AddDocumentStartJavaScript {
-        return contentScopeScriptsAddDocumentStartJavaScript
-    }
+) : AddDocumentStartJavaScriptBrowserPlugin {
+    override fun addDocumentStartJavaScript(): AddDocumentStartJavaScript = contentScopeScriptsAddDocumentStartJavaScript
 }
diff --git a/app/src/main/java/com/duckduckgo/app/browser/WebViewClientListener.kt b/app/src/main/java/com/duckduckgo/app/browser/WebViewClientListener.kt
@@ -31,7 +31,6 @@ import com.duckduckgo.app.global.model.Site
 import com.duckduckgo.app.surrogates.SurrogateResponse
 import com.duckduckgo.app.trackerdetection.model.TrackingEvent
 import com.duckduckgo.feature.toggles.api.Toggle
-import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScriptPlugin
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed
 import com.duckduckgo.site.permissions.api.SitePermissionsManager.SitePermissions
 
diff --git a/app/src/main/java/com/duckduckgo/app/plugins/AddDocumentStartJavaScriptPluginPoint.kt b/app/src/main/java/com/duckduckgo/app/plugins/AddDocumentStartJavaScriptPluginPoint.kt
@@ -17,12 +17,12 @@
 package com.duckduckgo.app.plugins
 
 import com.duckduckgo.anvil.annotations.ContributesPluginPoint
-import com.duckduckgo.browser.api.AddDocumentStartJavaScriptPlugin
+import com.duckduckgo.browser.api.AddDocumentStartJavaScriptBrowserPlugin
 import com.duckduckgo.di.scopes.AppScope
 
 @ContributesPluginPoint(
     scope = AppScope::class,
-    boundType = AddDocumentStartJavaScriptPlugin::class,
+    boundType = AddDocumentStartJavaScriptBrowserPlugin::class,
 )
 @Suppress("unused")
 interface UnusedJAddDocumentStartJavaScriptPluginPoint
diff --git a/browser-api/src/main/java/com/duckduckgo/browser/api/AddDocumentStartJavaScriptBrowserPlugin.kt b/browser-api/src/main/java/com/duckduckgo/browser/api/AddDocumentStartJavaScriptBrowserPlugin.kt
@@ -18,6 +18,6 @@ package com.duckduckgo.browser.api
 
 import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScript
 
-interface AddDocumentStartJavaScriptPlugin {
+interface AddDocumentStartJavaScriptBrowserPlugin {
     fun addDocumentStartJavaScript(): AddDocumentStartJavaScript
 }
diff --git a/content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/ContentScopeScriptsAddDocumentStartJavaScript.kt b/content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/ContentScopeScriptsAddDocumentStartJavaScript.kt
@@ -30,16 +30,14 @@ class ContentScopeScriptsAddDocumentStartJavaScript @Inject constructor(
     contentScopeExperiments: ContentScopeExperiments,
     scriptInjectorDelegate: AddDocumentStartScriptDelegate,
 ) : AddDocumentStartJavaScript by scriptInjectorDelegate.createPlugin(
-    object : AddDocumentStartJavaScriptScriptStrategy {
-        override suspend fun canInject(): Boolean {
-            return webViewCompatContentScopeScripts.isEnabled()
-        }
+        object : AddDocumentStartJavaScriptScriptStrategy {
+            override suspend fun canInject(): Boolean = webViewCompatContentScopeScripts.isEnabled()
 
-        override suspend fun getScriptString(): String {
-            val activeExperiments = contentScopeExperiments.getActiveExperiments()
-            return webViewCompatContentScopeScripts.getScript(activeExperiments)
-        }
+            override suspend fun getScriptString(): String {
+                val activeExperiments = contentScopeExperiments.getActiveExperiments()
+                return webViewCompatContentScopeScripts.getScript(activeExperiments)
+            }
 
-        override val allowedOriginRules: Set<String> = setOf("*")
-    },
-)
+            override val allowedOriginRules: Set<String> = setOf("*")
+        },
+    )
diff --git a/content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/ContentScopeScriptsAddDocumentStartJavaScriptTest.kt b/content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/ContentScopeScriptsAddDocumentStartJavaScriptTest.kt
@@ -27,25 +27,29 @@ class ContentScopeScriptsAddDocumentStartJavaScriptTest {
     private lateinit var testee: ContentScopeScriptsAddDocumentStartJavaScript
 
     @Before
-    fun setUp() = runTest {
-        whenever(mockActiveContentScopeExperiments.getActiveExperiments()).thenReturn(listOf())
-        whenever(mockAddDocumentStartScriptDelegate.createPlugin(any())).thenReturn(mockAddDocumentStartJavaScript)
-        testee = ContentScopeScriptsAddDocumentStartJavaScript(
-            mockWebViewCompatContentScopeScripts,
-            mockActiveContentScopeExperiments,
-            mockAddDocumentStartScriptDelegate,
-        )
-    }
+    fun setUp() =
+        runTest {
+            whenever(mockActiveContentScopeExperiments.getActiveExperiments()).thenReturn(listOf())
+            whenever(mockAddDocumentStartScriptDelegate.createPlugin(any())).thenReturn(mockAddDocumentStartJavaScript)
+            testee =
+                ContentScopeScriptsAddDocumentStartJavaScript(
+                    mockWebViewCompatContentScopeScripts,
+                    mockActiveContentScopeExperiments,
+                    mockAddDocumentStartScriptDelegate,
+                )
+        }
 
     @Test
-    fun whenAddDocumentStartJavaScriptCalledThenDelegateToCreatedPlugin() = runTest {
-        testee.addDocumentStartJavaScript(mockWebView)
+    fun whenAddDocumentStartJavaScriptCalledThenDelegateToCreatedPlugin() =
+        runTest {
+            testee.addDocumentStartJavaScript(mockWebView)
 
-        verify(mockAddDocumentStartJavaScript).addDocumentStartJavaScript(mockWebView)
-    }
+            verify(mockAddDocumentStartJavaScript).addDocumentStartJavaScript(mockWebView)
+        }
 
     @Test
-    fun whenConstructedThenCreatePluginWithCorrectStrategy() = runTest {
-        verify(mockAddDocumentStartScriptDelegate).createPlugin(any())
-    }
+    fun whenConstructedThenCreatePluginWithCorrectStrategy() =
+        runTest {
+            verify(mockAddDocumentStartScriptDelegate).createPlugin(any())
+        }
 }
diff --git a/js-messaging/js-messaging-api/src/main/java/com/duckduckgo/js/messaging/api/AddDocumentStartJavaScript.kt b/js-messaging/js-messaging-api/src/main/java/com/duckduckgo/js/messaging/api/AddDocumentStartJavaScript.kt
@@ -24,10 +24,7 @@ import android.webkit.WebView
  * Useful for privacy protections and that need to run as early as possible and/or on iframes.
  */
 interface AddDocumentStartJavaScript {
-
-    suspend fun addDocumentStartJavaScript(
-        webView: WebView,
-    )
+    suspend fun addDocumentStartJavaScript(webView: WebView)
 }
 
 /**
diff --git a/js-messaging/js-messaging-impl/src/main/java/com/duckduckgo/js/messaging/impl/RealAddDocumentStartScriptDelegate.kt b/js-messaging/js-messaging-impl/src/main/java/com/duckduckgo/js/messaging/impl/RealAddDocumentStartScriptDelegate.kt
@@ -28,32 +28,31 @@ import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScript
 import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScriptScriptStrategy
 import com.duckduckgo.js.messaging.api.AddDocumentStartScriptDelegate
 import com.squareup.anvil.annotations.ContributesBinding
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import javax.inject.Inject
 
-@ContributesBinding(AppScope::class)
 /**
  * Delegate class that implements AddDocumentStartJavaScriptPlugin and handles
  * the common script injection logic
  */
+@ContributesBinding(AppScope::class)
 class RealAddDocumentStartScriptDelegate @Inject constructor(
     private val webViewCapabilityChecker: WebViewCapabilityChecker,
     @AppCoroutineScope private val coroutineScope: CoroutineScope,
     private val dispatcherProvider: DispatcherProvider,
     private val webViewCompatWrapper: WebViewCompatWrapper,
 ) : AddDocumentStartScriptDelegate {
-
     override fun createPlugin(strategy: AddDocumentStartJavaScriptScriptStrategy): AddDocumentStartJavaScript {
         return object : AddDocumentStartJavaScript {
-
             private var script: ScriptHandler? = null
             private var currentScriptString: String? = null
 
             @SuppressLint("RequiresFeature")
             override suspend fun addDocumentStartJavaScript(webView: WebView) {
-                if (!strategy.canInject() || !webViewCapabilityChecker.isSupported(
+                if (!strategy.canInject() ||
+                    !webViewCapabilityChecker.isSupported(
                         WebViewCapabilityChecker.WebViewCapability.DocumentStartJavaScript,
                     )
                 ) {
@@ -71,14 +70,15 @@ class RealAddDocumentStartScriptDelegate @Inject constructor(
                     script = null
                 }
 
-                webViewCompatWrapper.addDocumentStartJavaScript(
-                    webView,
-                    scriptString,
-                    strategy.allowedOriginRules,
-                )?.let {
-                    script = it
-                    currentScriptString = scriptString
-                }
+                webViewCompatWrapper
+                    .addDocumentStartJavaScript(
+                        webView,
+                        scriptString,
+                        strategy.allowedOriginRules,
+                    )?.let {
+                        script = it
+                        currentScriptString = scriptString
+                    }
             }
         }
     }
diff --git a/js-messaging/js-messaging-impl/src/test/java/com/duckduckgo/js/messaging/impl/RealAddDocumentStartScriptDelegateTest.kt b/js-messaging/js-messaging-impl/src/test/java/com/duckduckgo/js/messaging/impl/RealAddDocumentStartScriptDelegateTest.kt

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ package com.duckduckgo.browser.api`
`18`	`18`
`19`	`19`	`import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScript`
`20`	`20`
`21`		`-interface AddDocumentStartJavaScriptPlugin {`
	`21`	`+interface AddDocumentStartJavaScriptBrowserPlugin {`
`22`	`22`	`fun addDocumentStartJavaScript(): AddDocumentStartJavaScript`
`23`	`23`	`}`