Fix issues after rebase

Author: CrisBarreiro

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

@@ -68,6 +68,7 @@ import com.duckduckgo.autoconsent.api.Autoconsent
 import com.duckduckgo.autofill.api.BrowserAutofill
 import com.duckduckgo.autofill.api.InternalTestUserChecker
 import com.duckduckgo.browser.api.JsInjectorPlugin
+import com.duckduckgo.browser.api.WebMessagingBrowserPlugin
 import com.duckduckgo.browser.api.WebViewVersionProvider
 import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.common.utils.CurrentTimeProvider
@@ -86,7 +87,7 @@ import com.duckduckgo.feature.toggles.api.Toggle
 import com.duckduckgo.history.api.NavigationHistory
 import com.duckduckgo.js.messaging.api.PostMessageWrapperPlugin
 import com.duckduckgo.js.messaging.api.SubscriptionEventData
-import com.duckduckgo.js.messaging.api.WebMessagingPlugin
+import com.duckduckgo.js.messaging.api.WebMessaging
 import com.duckduckgo.js.messaging.api.WebViewCompatMessageCallback
 import com.duckduckgo.privacy.config.api.AmpLinks
 import com.duckduckgo.subscriptions.api.Subscriptions
@@ -380,10 +381,10 @@ class BrowserWebViewClientTest {
     @Test
     fun whenConfigureWebViewThenAddWebMessageListener() =
         runTest {
-            assertFalse(fakeMessagingPlugins.plugin.registered)
+            assertFalse(fakeMessagingPlugins.plugin.webMessaging().registered)
             val mockCallback = mock<WebViewCompatMessageCallback>()
             testee.configureWebView(DuckDuckGoWebView(context), mockCallback)
-            assertTrue(fakeMessagingPlugins.plugin.registered)
+            assertTrue(fakeMessagingPlugins.plugin.webMessaging().registered)
         }
 
     @Test
@@ -1342,7 +1343,7 @@ class BrowserWebViewClientTest {
         const val EXAMPLE_URL = "https://example.com"
     }
 
-    class FakeWebMessagingPlugin : WebMessagingPlugin.WebMessaging {
+    class FakeWebMessaging : WebMessaging {
         var registered = false
             private set
 
@@ -1367,10 +1368,16 @@ class BrowserWebViewClientTest {
             get() = "test"
     }
 
-    class FakeWebMessagingPluginPoint : PluginPoint<WebMessaging> {
-        val plugin = FakeWebMessagingPlugin()
+    class FakeWebMessagingBrowserPlugin : WebMessagingBrowserPlugin {
+        private val webMessaging = FakeWebMessaging()
 
-        override fun getPlugins(): Collection<WebMessaging> {
+        override fun webMessaging(): FakeWebMessaging = webMessaging
+    }
+
+    class FakeWebMessagingPluginPoint : PluginPoint<WebMessagingBrowserPlugin> {
+        val plugin = FakeWebMessagingBrowserPlugin()
+
+        override fun getPlugins(): Collection<WebMessagingBrowserPlugin> {
             return listOf(plugin)
         }
     }

content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsPostMessageWrapperPluginTest.kt

@@ -65,8 +65,8 @@ class ContentScopeScriptsPostMessageWrapperPluginTest {
 
             testee.postMessage(subscriptionEventData, mockWebView)
 
-        verify(mockWebMessaging).postMessage(mockWebView, subscriptionEventData)
-    }
+            verify(mockWebMessaging).postMessage(mockWebView, subscriptionEventData)
+        }
 
     @Test
     fun whenWebViewCompatContentScopeScriptsIsNotEnabledThenPostMessageToContentScopeScriptsJsMessaging() =

js-messaging/js-messaging-impl/src/main/java/com/duckduckgo/js/messaging/impl/RealWebMessagingDelegate.kt

@@ -38,13 +38,13 @@ import com.duckduckgo.js.messaging.api.WebMessagingStrategy
 import com.duckduckgo.js.messaging.api.WebViewCompatMessageCallback
 import com.squareup.anvil.annotations.ContributesBinding
 import com.squareup.moshi.Moshi
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import logcat.LogPriority.ERROR
 import logcat.asLog
 import logcat.logcat
 import org.json.JSONObject
+import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class RealWebMessagingDelegate @Inject constructor(
@@ -162,8 +162,8 @@ class RealWebMessagingDelegate @Inject constructor(
                 webView: WebView,
             ) {
                 if (!strategy.canHandleMessaging()) {
-                return
-            }
+                    return
+                }
 
                 runCatching {
                     return@runCatching webViewCompatWrapper.addWebMessageListener(
@@ -181,7 +181,6 @@ class RealWebMessagingDelegate @Inject constructor(
                 }.getOrElse { exception ->
                     logcat(ERROR) { "Error adding WebMessageListener for ${strategy.objectName}: ${exception.asLog()}" }
                 }
-
             }
 
             override suspend fun unregister(

js-messaging/js-messaging-impl/src/test/java/com/duckduckgo/js/messaging/impl/RealWebMessagingDelegateTest.kt

@@ -240,24 +240,28 @@ class RealWebMessagingDelegateTest {
             override suspend fun canHandleMessaging(): Boolean = canHandleMessaging
 
             override fun getMessageHandlers(): List<WebViewCompatMessageHandler> {
-                return listOf(object : WebViewCompatMessageHandler {
-                    override fun process(jsMessage: JsMessage): ProcessResult {
-                        return SendToConsumer
-                    }
-
-                    override val featureName: String = "testFeature"
-                    override val methods: List<String> = listOf("testMethod")
-                },)
+                return listOf(
+                    object : WebViewCompatMessageHandler {
+                        override fun process(jsMessage: JsMessage): ProcessResult {
+                            return SendToConsumer
+                        }
+
+                        override val featureName: String = "testFeature"
+                        override val methods: List<String> = listOf("testMethod")
+                    },
+                )
             }
 
             override fun getGlobalMessageHandler(): List<GlobalJsMessageHandler> {
-                return listOf(object : GlobalJsMessageHandler {
-                    override fun process(jsMessage: JsMessage): ProcessResult {
-                        return SendToConsumer
-                    }
-
-                    override val method: String = "globalMethod"
-                },)
+                return listOf(
+                    object : GlobalJsMessageHandler {
+                        override fun process(jsMessage: JsMessage): ProcessResult {
+                            return SendToConsumer
+                        }
+
+                        override val method: String = "globalMethod"
+                    },
+                )
             }
         }
     }