Skip to content

Commit ca214eb

Browse files
CrisBarreiroCrisBarreiro
committed
Fix issues after rebasing
1 parent 27185d2 commit ca214eb

File tree

12 files changed

+126
-117
lines changed

12 files changed

+126
-117
lines changed

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ import com.duckduckgo.autofill.api.passwordgeneration.AutomaticSavedLoginsMonito
207207
import com.duckduckgo.autofill.impl.AutofillFireproofDialogSuppressor
208208
import com.duckduckgo.brokensite.api.BrokenSitePrompt
209209
import com.duckduckgo.brokensite.api.RefreshPattern
210+
import com.duckduckgo.browser.api.AddDocumentStartJavaScriptBrowserPlugin
210211
import com.duckduckgo.browser.api.UserBrowserProperties
211212
import com.duckduckgo.browser.api.autocomplete.AutoComplete
212213
import com.duckduckgo.browser.api.autocomplete.AutoComplete.AutoCompleteSuggestion.AutoCompleteDefaultSuggestion
@@ -254,7 +255,7 @@ import com.duckduckgo.feature.toggles.api.Toggle
254255
import com.duckduckgo.feature.toggles.api.Toggle.State
255256
import com.duckduckgo.history.api.HistoryEntry.VisitedPage
256257
import com.duckduckgo.history.api.NavigationHistory
257-
import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScriptPlugin
258+
import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScript
258259
import com.duckduckgo.js.messaging.api.JsCallbackData
259260
import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed
260261
import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed.MALWARE
@@ -7451,11 +7452,11 @@ class BrowserTabViewModelTest {
74517452

74527453
@Test
74537454
fun whenConfigureWebViewThenCallAddDocumentStartJavaScript() {
7454-
assertEquals(0, fakeAddDocumentStartJavaScriptPlugins.plugin.countInitted)
7455+
assertEquals(0, fakeAddDocumentStartJavaScriptPlugins.plugin.addDocumentStartJavaScript().countInitted)
74557456

74567457
testee.addDocumentStartJavaScript(mockWebView)
74577458

7458-
assertEquals(1, fakeAddDocumentStartJavaScriptPlugins.plugin.countInitted)
7459+
assertEquals(1, fakeAddDocumentStartJavaScriptPlugins.plugin.addDocumentStartJavaScript().countInitted)
74597460
}
74607461

74617462
private fun aCredential(): LoginCredentials = LoginCredentials(domain = null, username = null, password = null)
@@ -7745,7 +7746,13 @@ class BrowserTabViewModelTest {
77457746
override fun getCustomHeaders(url: String): Map<String, String> = headers
77467747
}
77477748

7748-
class FakeAddDocumentStartJavaScriptPlugin : AddDocumentStartJavaScriptPlugin {
7749+
class FakeAddDocumentStartJavaScriptBrowserPlugin : AddDocumentStartJavaScriptBrowserPlugin {
7750+
private val addDocumentStartJavaScript = FakeAddDocumentStartJavaScript()
7751+
7752+
override fun addDocumentStartJavaScript(): FakeAddDocumentStartJavaScript = addDocumentStartJavaScript
7753+
}
7754+
7755+
class FakeAddDocumentStartJavaScript : AddDocumentStartJavaScript {
77497756
var countInitted = 0
77507757
private set
77517758

@@ -7754,8 +7761,8 @@ class BrowserTabViewModelTest {
77547761
}
77557762
}
77567763

7757-
class FakeAddDocumentStartJavaScriptPluginPoint : PluginPoint<AddDocumentStartJavaScriptPlugin> {
7758-
val plugin = FakeAddDocumentStartJavaScriptPlugin()
7764+
class FakeAddDocumentStartJavaScriptPluginPoint : PluginPoint<AddDocumentStartJavaScriptBrowserPlugin> {
7765+
val plugin = FakeAddDocumentStartJavaScriptBrowserPlugin()
77597766

77607767
override fun getPlugins() = listOf(plugin)
77617768
}

‎app/src/androidTest/java/com/duckduckgo/app/browser/BrowserWebViewClientTest.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ import com.duckduckgo.app.statistics.pixels.Pixel
6767
import com.duckduckgo.autoconsent.api.Autoconsent
6868
import com.duckduckgo.autofill.api.BrowserAutofill
6969
import com.duckduckgo.autofill.api.InternalTestUserChecker
70-
import com.duckduckgo.browser.api.AddDocumentStartJavaScriptPlugin
7170
import com.duckduckgo.browser.api.JsInjectorPlugin
7271
import com.duckduckgo.browser.api.WebViewVersionProvider
7372
import com.duckduckgo.common.test.CoroutineTestRule

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ import com.duckduckgo.autofill.api.passwordgeneration.AutomaticSavedLoginsMonito
274274
import com.duckduckgo.autofill.impl.AutofillFireproofDialogSuppressor
275275
import com.duckduckgo.brokensite.api.BrokenSitePrompt
276276
import com.duckduckgo.brokensite.api.RefreshPattern
277+
import com.duckduckgo.browser.api.AddDocumentStartJavaScriptBrowserPlugin
277278
import com.duckduckgo.browser.api.UserBrowserProperties
278279
import com.duckduckgo.browser.api.autocomplete.AutoComplete
279280
import com.duckduckgo.browser.api.autocomplete.AutoComplete.AutoCompleteResult
@@ -319,7 +320,6 @@ import com.duckduckgo.duckplayer.api.DuckPlayer
319320
import com.duckduckgo.duckplayer.api.DuckPlayer.DuckPlayerState.ENABLED
320321
import com.duckduckgo.feature.toggles.api.Toggle
321322
import com.duckduckgo.history.api.NavigationHistory
322-
import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScriptPlugin
323323
import com.duckduckgo.js.messaging.api.JsCallbackData
324324
import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed
325325
import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed.MALWARE
@@ -485,7 +485,7 @@ class BrowserTabViewModel @Inject constructor(
485485
private val externalIntentProcessingState: ExternalIntentProcessingState,
486486
private val vpnMenuStateProvider: VpnMenuStateProvider,
487487
private val webViewCompatWrapper: WebViewCompatWrapper,
488-
private val addDocumentStartJavascriptPlugins: PluginPoint<AddDocumentStartJavaScriptPlugin>,
488+
private val addDocumentStartJavascriptPlugins: PluginPoint<AddDocumentStartJavaScriptBrowserPlugin>,
489489
) : ViewModel(),
490490
WebViewClientListener,
491491
EditSavedSiteListener,
@@ -4210,9 +4210,7 @@ class BrowserTabViewModel @Inject constructor(
42104210
override fun addDocumentStartJavaScript(webView: WebView) {
42114211
viewModelScope.launch {
42124212
addDocumentStartJavascriptPlugins.getPlugins().forEach {
4213-
it.addDocumentStartJavaScript(
4214-
webView,
4215-
)
4213+
it.addDocumentStartJavaScript().addDocumentStartJavaScript(webView)
42164214
}
42174215
}
42184216
}

‎app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ import com.duckduckgo.app.statistics.pixels.Pixel
6565
import com.duckduckgo.autoconsent.api.Autoconsent
6666
import com.duckduckgo.autofill.api.BrowserAutofill
6767
import com.duckduckgo.autofill.api.InternalTestUserChecker
68-
import com.duckduckgo.browser.api.AddDocumentStartJavaScriptPlugin
6968
import com.duckduckgo.browser.api.JsInjectorPlugin
7069
import com.duckduckgo.common.utils.AppUrl.ParamKey.QUERY
7170
import com.duckduckgo.common.utils.CurrentTimeProvider

‎app/src/main/java/com/duckduckgo/app/browser/ContentScopeScriptsAddDocumentStartJavaScriptPlugin.kt‎ renamed to ‎app/src/main/java/com/duckduckgo/app/browser/ContentScopeScriptsAddDocumentStartJavaScriptBrowserPlugin.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,16 @@
1616

1717
package com.duckduckgo.app.browser
1818

19-
import com.duckduckgo.browser.api.AddDocumentStartJavaScriptPlugin
19+
import com.duckduckgo.browser.api.AddDocumentStartJavaScriptBrowserPlugin
2020
import com.duckduckgo.contentscopescripts.impl.ContentScopeScriptsAddDocumentStartJavaScript
2121
import com.duckduckgo.di.scopes.FragmentScope
2222
import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScript
2323
import com.squareup.anvil.annotations.ContributesMultibinding
2424
import javax.inject.Inject
2525

2626
@ContributesMultibinding(FragmentScope::class)
27-
class ContentScopeScriptsAddDocumentStartJavaScriptPlugin @Inject constructor(
27+
class ContentScopeScriptsAddDocumentStartJavaScriptBrowserPlugin @Inject constructor(
2828
private val contentScopeScriptsAddDocumentStartJavaScript: ContentScopeScriptsAddDocumentStartJavaScript,
29-
) : AddDocumentStartJavaScriptPlugin {
30-
override fun addDocumentStartJavaScript(): AddDocumentStartJavaScript {
31-
return contentScopeScriptsAddDocumentStartJavaScript
32-
}
29+
) : AddDocumentStartJavaScriptBrowserPlugin {
30+
override fun addDocumentStartJavaScript(): AddDocumentStartJavaScript = contentScopeScriptsAddDocumentStartJavaScript
3331
}

‎app/src/main/java/com/duckduckgo/app/plugins/AddDocumentStartJavaScriptPluginPoint.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
package com.duckduckgo.app.plugins
1818

1919
import com.duckduckgo.anvil.annotations.ContributesPluginPoint
20-
import com.duckduckgo.browser.api.AddDocumentStartJavaScriptPlugin
20+
import com.duckduckgo.browser.api.AddDocumentStartJavaScriptBrowserPlugin
2121
import com.duckduckgo.di.scopes.AppScope
2222

2323
@ContributesPluginPoint(
2424
scope = AppScope::class,
25-
boundType = AddDocumentStartJavaScriptPlugin::class,
25+
boundType = AddDocumentStartJavaScriptBrowserPlugin::class,
2626
)
2727
@Suppress("unused")
2828
interface UnusedJAddDocumentStartJavaScriptPluginPoint

‎browser-api/src/main/java/com/duckduckgo/browser/api/AddDocumentStartJavaScriptPlugin.kt‎ renamed to ‎browser-api/src/main/java/com/duckduckgo/browser/api/AddDocumentStartJavaScriptBrowserPlugin.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ package com.duckduckgo.browser.api
1818

1919
import com.duckduckgo.js.messaging.api.AddDocumentStartJavaScript
2020

21-
interface AddDocumentStartJavaScriptPlugin {
21+
interface AddDocumentStartJavaScriptBrowserPlugin {
2222
fun addDocumentStartJavaScript(): AddDocumentStartJavaScript
2323
}

‎content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/ContentScopeScriptsAddDocumentStartJavaScript.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ class ContentScopeScriptsAddDocumentStartJavaScript @Inject constructor(
3131
scriptInjectorDelegate: AddDocumentStartScriptDelegate,
3232
) : AddDocumentStartJavaScript by scriptInjectorDelegate.createPlugin(
3333
object : AddDocumentStartJavaScriptScriptStrategy {
34-
override suspend fun canInject(): Boolean {
35-
return webViewCompatContentScopeScripts.isEnabled()
36-
}
34+
override suspend fun canInject(): Boolean = webViewCompatContentScopeScripts.isEnabled()
3735

3836
override suspend fun getScriptString(): String {
3937
val activeExperiments = contentScopeExperiments.getActiveExperiments()

‎content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/ContentScopeScriptsAddDocumentStartJavaScriptTest.kt‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,29 @@ class ContentScopeScriptsAddDocumentStartJavaScriptTest {
2727
private lateinit var testee: ContentScopeScriptsAddDocumentStartJavaScript
2828

2929
@Before
30-
fun setUp() = runTest {
31-
whenever(mockActiveContentScopeExperiments.getActiveExperiments()).thenReturn(listOf())
32-
whenever(mockAddDocumentStartScriptDelegate.createPlugin(any())).thenReturn(mockAddDocumentStartJavaScript)
33-
testee = ContentScopeScriptsAddDocumentStartJavaScript(
34-
mockWebViewCompatContentScopeScripts,
35-
mockActiveContentScopeExperiments,
36-
mockAddDocumentStartScriptDelegate,
37-
)
38-
}
30+
fun setUp() =
31+
runTest {
32+
whenever(mockActiveContentScopeExperiments.getActiveExperiments()).thenReturn(listOf())
33+
whenever(mockAddDocumentStartScriptDelegate.createPlugin(any())).thenReturn(mockAddDocumentStartJavaScript)
34+
testee =
35+
ContentScopeScriptsAddDocumentStartJavaScript(
36+
mockWebViewCompatContentScopeScripts,
37+
mockActiveContentScopeExperiments,
38+
mockAddDocumentStartScriptDelegate,
39+
)
40+
}
3941

4042
@Test
41-
fun whenAddDocumentStartJavaScriptCalledThenDelegateToCreatedPlugin() = runTest {
42-
testee.addDocumentStartJavaScript(mockWebView)
43+
fun whenAddDocumentStartJavaScriptCalledThenDelegateToCreatedPlugin() =
44+
runTest {
45+
testee.addDocumentStartJavaScript(mockWebView)
4346

44-
verify(mockAddDocumentStartJavaScript).addDocumentStartJavaScript(mockWebView)
45-
}
47+
verify(mockAddDocumentStartJavaScript).addDocumentStartJavaScript(mockWebView)
48+
}
4649

4750
@Test
48-
fun whenConstructedThenCreatePluginWithCorrectStrategy() = runTest {
49-
verify(mockAddDocumentStartScriptDelegate).createPlugin(any())
50-
}
51+
fun whenConstructedThenCreatePluginWithCorrectStrategy() =
52+
runTest {
53+
verify(mockAddDocumentStartScriptDelegate).createPlugin(any())
54+
}
5155
}

‎js-messaging/js-messaging-api/src/main/java/com/duckduckgo/js/messaging/api/AddDocumentStartJavaScript.kt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ import android.webkit.WebView
2424
* Useful for privacy protections and that need to run as early as possible and/or on iframes.
2525
*/
2626
interface AddDocumentStartJavaScript {
27-
28-
suspend fun addDocumentStartJavaScript(
29-
webView: WebView,
30-
)
27+
suspend fun addDocumentStartJavaScript(webView: WebView)
3128
}
3229

3330
/**

0 commit comments

Comments
 (0)