Simplify APIs

Author: CrisBarreiro

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

@@ -1350,7 +1350,7 @@ class BrowserWebViewClientTest {
         }
 
         // TODO (cbarreiro) Test message posting
-        override suspend fun postMessage(subscriptionEventData: SubscriptionEventData): Boolean {
+        override fun postMessage(subscriptionEventData: SubscriptionEventData) {
             TODO("Not yet implemented")
         }
     }

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

@@ -1200,12 +1200,8 @@ class BrowserTabFragment :
     }
 
     private fun postBreakageReportingEvent() {
-        appCoroutineScope.launch {
-            val eventData = createBreakageReportingEventData()
-            webViewClient.postMessage(eventData) {
-                contentScopeScripts.sendSubscriptionEvent(eventData)
-            }
-        }
+        val eventData = createBreakageReportingEventData()
+        webViewClient.postMessage(eventData)
     }
 
     private fun onFireButtonPressed() {

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

@@ -763,14 +763,11 @@ class BrowserWebViewClient @Inject constructor(
         }
     }
 
-    suspend fun postMessage(
+    fun postMessage(
         eventData: SubscriptionEventData,
-        fallback: () -> Unit,
     ) {
         webMessagingPlugins.getPlugins().forEach {
-            if (!it.postMessage(eventData)) {
-                fallback()
-            }
+            it.postMessage(eventData)
         }
     }
 }

content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsWebMessagingPlugin.kt

@@ -53,6 +53,7 @@ class ContentScopeScriptsWebMessagingPlugin @Inject constructor(
     private val handlers: PluginPoint<WebViewCompatContentScopeJsMessageHandlersPlugin>,
     private val globalHandlers: PluginPoint<GlobalContentScopeJsMessageHandlersPlugin>,
     private val webViewCompatContentScopeScripts: WebViewCompatContentScopeScripts,
+    private val contentScopeScriptsJsMessaging: ContentScopeScriptsJsMessaging,
     private val webViewCompatWrapper: WebViewCompatWrapper,
     private val dispatcherProvider: DispatcherProvider,
     @AppCoroutineScope private val appCoroutineScope: CoroutineScope,
@@ -211,25 +212,26 @@ class ContentScopeScriptsWebMessagingPlugin @Inject constructor(
     }
 
     @SuppressLint("RequiresFeature")
-    override suspend fun postMessage(subscriptionEventData: SubscriptionEventData): Boolean {
-        return runCatching {
-            if (!webViewCompatContentScopeScripts.isEnabled()) {
-                return false
-            }
+    override fun postMessage(subscriptionEventData: SubscriptionEventData) {
+        runCatching {
+            appCoroutineScope.launch {
+                if (!webViewCompatContentScopeScripts.isEnabled()) {
+                    contentScopeScriptsJsMessaging.sendSubscriptionEvent(subscriptionEventData)
+                }
 
-            val subscriptionEvent = SubscriptionEvent(
-                context = context,
-                featureName = subscriptionEventData.featureName,
-                subscriptionName = subscriptionEventData.subscriptionName,
-                params = subscriptionEventData.params,
-            ).let {
-                moshi.adapter(SubscriptionEvent::class.java).toJson(it)
-            }
+                val subscriptionEvent = SubscriptionEvent(
+                    context = context,
+                    featureName = subscriptionEventData.featureName,
+                    subscriptionName = subscriptionEventData.subscriptionName,
+                    params = subscriptionEventData.params,
+                ).let {
+                    moshi.adapter(SubscriptionEvent::class.java).toJson(it)
+                }
 
-            withContext(dispatcherProvider.main()) {
-                globalReplyProxy?.postMessage(subscriptionEvent)
-                true
+                withContext(dispatcherProvider.main()) {
+                    globalReplyProxy?.postMessage(subscriptionEvent)
+                }
             }
-        }.getOrElse { false }
+        }
     }
 }

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

@@ -110,6 +110,7 @@ class ContentScopeScriptsWebMessagingPluginTest {
             webViewCompatWrapper = mockWebViewCompatWrapper,
             dispatcherProvider = coroutineRule.testDispatcherProvider,
             appCoroutineScope = coroutineRule.testScope,
+            contentScopeScriptsJsMessaging = mock(),
         )
     }
 

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

@@ -28,5 +28,5 @@ interface WebMessagingPlugin {
         webView: WebView,
     )
 
-    suspend fun postMessage(subscriptionEventData: SubscriptionEventData): Boolean
+    fun postMessage(subscriptionEventData: SubscriptionEventData)
 }