Skip to content

Commit 9f89cf3

Browse files
committed
Revert unnecesssary changes after refactor
1 parent fd8e009 commit 9f89cf3

File tree

3 files changed

+10
-21
lines changed

3 files changed

+10
-21
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -482,14 +482,14 @@ class BrowserWebViewClient @Inject constructor(
482482

483483
// See https://app.asana.com/0/0/1206159443951489/f (WebView limitations)
484484
if (webView.progress == 100) {
485+
jsPlugins.getPlugins().forEach {
486+
it.onPageFinished(
487+
webView,
488+
url,
489+
webViewClientListener?.getSite(),
490+
)
491+
}
485492
appCoroutineScope.launch {
486-
jsPlugins.getPlugins().forEach {
487-
it.onPageFinished(
488-
webView,
489-
url,
490-
webViewClientListener?.getSite(),
491-
)
492-
}
493493
(webView as? DuckDuckGoWebView)?.let { duckDuckGoWebView ->
494494
val activeExperiments = webViewClientListener?.getSite()?.activeContentScopeExperiments ?: listOf()
495495
addDocumentStartJavascriptPlugins.getPlugins().forEach {

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,12 @@ import android.graphics.Bitmap
2020
import android.webkit.WebView
2121
import android.webkit.WebViewClient
2222
import androidx.annotation.UiThread
23-
import com.duckduckgo.app.di.AppCoroutineScope
2423
import com.duckduckgo.browser.api.JsInjectorPlugin
2524
import com.duckduckgo.common.utils.plugins.PluginPoint
2625
import javax.inject.Inject
27-
import kotlinx.coroutines.CoroutineScope
28-
import kotlinx.coroutines.launch
2926

3027
class DuckChatWebViewClient @Inject constructor(
3128
private val jsPlugins: PluginPoint<JsInjectorPlugin>,
32-
@AppCoroutineScope private val appCoroutineScope: CoroutineScope,
3329
) : WebViewClient() {
3430

3531
@UiThread
@@ -38,10 +34,8 @@ class DuckChatWebViewClient @Inject constructor(
3834
url: String?,
3935
favicon: Bitmap?,
4036
) {
41-
appCoroutineScope.launch {
42-
jsPlugins.getPlugins().forEach {
43-
it.onPageStarted(webView, url, null)
44-
}
37+
jsPlugins.getPlugins().forEach {
38+
it.onPageStarted(webView, url, null)
4539
}
4640
}
4741
}

duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/ui/DuckChatWebViewClientTest.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,22 @@ package com.duckduckgo.duckchat.impl.ui
1818

1919
import android.webkit.WebView
2020
import com.duckduckgo.browser.api.JsInjectorPlugin
21-
import com.duckduckgo.common.test.CoroutineTestRule
2221
import com.duckduckgo.common.utils.plugins.PluginPoint
2322
import kotlinx.coroutines.test.runTest
24-
import org.junit.Rule
2523
import org.junit.Test
2624
import org.mockito.kotlin.mock
2725
import org.mockito.kotlin.verify
2826
import org.mockito.kotlin.whenever
2927

3028
class DuckChatWebViewClientTest {
3129

32-
@get:Rule
33-
var coroutineRule = CoroutineTestRule()
34-
3530
@Test
3631
fun whenOnPageStartedCalledThenJsPluginOnPageStartedInvoked() = runTest {
3732
val mockPlugin: JsInjectorPlugin = mock()
3833
val pluginPoint: PluginPoint<JsInjectorPlugin> = mock()
3934
whenever(pluginPoint.getPlugins()).thenReturn(listOf(mockPlugin))
4035

41-
val duckChatWebViewClient = DuckChatWebViewClient(pluginPoint, coroutineRule.testScope)
36+
val duckChatWebViewClient = DuckChatWebViewClient(pluginPoint)
4237
val webView: WebView = mock()
4338
val url = "https://example.com"
4439

0 commit comments

Comments
 (0)