Refine postMessage fallback

Author: CrisBarreiro

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

@@ -487,17 +487,13 @@ class RealDuckDuckGoWebView : DuckDuckGoWebView, NestedScrollingChild3 {
     override suspend fun safePostMessage(
         replyProxy: JavaScriptReplyProxy,
         response: String,
-    ): Boolean {
-        return runCatching {
-            return if (webViewCapabilityChecker.isSupported(WebViewCapability.WebMessageListener)) {
+    ) {
+        runCatching {
+            if (webViewCapabilityChecker.isSupported(WebViewCapability.WebMessageListener)) {
                 replyProxy.postMessage(response)
-                true
-            } else {
-                false
             }
         }.getOrElse { exception ->
             logcat(ERROR) { "Error posting message: ${exception.asLog()}" }
-            false
         }
     }
 

browser-api/src/main/java/com/duckduckgo/app/browser/api/DuckDuckGoWebView.kt

@@ -90,10 +90,9 @@ abstract class DuckDuckGoWebView(
      *
      * @param replyProxy The proxy to send the message to.
      * @param response The message content to send.
-     * @return `true` if the message was sent successfully, `false` otherwise.
      */
     abstract suspend fun safePostMessage(
         replyProxy: JavaScriptReplyProxy,
         response: String,
-    ): Boolean
+    )
 }

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

@@ -26,6 +26,7 @@ import com.duckduckgo.common.utils.plugins.PluginPoint
 import com.duckduckgo.contentscopescripts.api.AdsjsContentScopeJsMessageHandlersPlugin
 import com.duckduckgo.contentscopescripts.api.GlobalContentScopeJsMessageHandlersPlugin
 import com.duckduckgo.contentscopescripts.impl.AdsJsContentScopeScripts
+import com.duckduckgo.contentscopescripts.impl.ContentScopeScriptsFeature
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.js.messaging.api.AdsjsJsMessageCallback
 import com.duckduckgo.js.messaging.api.AdsjsMessaging
@@ -55,6 +56,7 @@ class AdsjsContentScopeMessaging @Inject constructor(
     private val adsJsContentScopeScripts: AdsJsContentScopeScripts,
     private val dispatcherProvider: DispatcherProvider,
     @AppCoroutineScope private val appCoroutineScope: CoroutineScope,
+    private val contentScopeScriptsFeature: ContentScopeScriptsFeature,
 ) : AdsjsMessaging {
 
     private val moshi = Moshi.Builder().add(JSONObjectAdapter()).build()
@@ -80,6 +82,7 @@ class AdsjsContentScopeMessaging @Inject constructor(
                 if (context == jsMessage.context) {
                     // Setup reply proxy so we can send subscription events
                     if (jsMessage.featureName == "messaging" || jsMessage.method == "initialPing") {
+                        logcat("Cris") { "initialPing" }
                         globalReplyProxy = replyProxy
                     }
 
@@ -159,6 +162,9 @@ class AdsjsContentScopeMessaging @Inject constructor(
                 put("featureName", response.featureName)
                 put("context", context)
             }
+
+            logcat("Cris") { "Sending response: $responseWithId" }
+
             appCoroutineScope.launch(dispatcherProvider.main()) {
                 (webView as? DuckDuckGoWebView)?.safePostMessage(
                     replyProxy,
@@ -169,26 +175,31 @@ class AdsjsContentScopeMessaging @Inject constructor(
     }
 
     override suspend fun postMessage(subscriptionEventData: SubscriptionEventData): Boolean {
-        return runCatching {
-            val subscriptionEvent = SubscriptionEvent(
-                context = context,
-                featureName = subscriptionEventData.featureName,
-                subscriptionName = subscriptionEventData.subscriptionName,
-                params = subscriptionEventData.params,
-            ).let {
-                moshi.adapter(SubscriptionEvent::class.java).toJson(it)
-            }
+        val newWebCompatApisEnabled = withContext(dispatcherProvider.io()) {
+            contentScopeScriptsFeature.useNewWebCompatApis().isEnabled()
+        }
 
-            withContext(dispatcherProvider.main()) {
-                globalReplyProxy?.let {
-                    (webView as? DuckDuckGoWebView)?.safePostMessage(
-                        it,
-                        subscriptionEvent,
-                    )
-                } ?: false
+        if (!newWebCompatApisEnabled) {
+            return false
+        }
+
+        val subscriptionEvent = SubscriptionEvent(
+            context = context,
+            featureName = subscriptionEventData.featureName,
+            subscriptionName = subscriptionEventData.subscriptionName,
+            params = subscriptionEventData.params,
+        ).let {
+            moshi.adapter(SubscriptionEvent::class.java).toJson(it)
+        }
+
+        return withContext(dispatcherProvider.main()) {
+            globalReplyProxy?.let {
+                (webView as? DuckDuckGoWebView)?.safePostMessage(
+                    it,
+                    subscriptionEvent,
+                )
             }
-        }.getOrElse {
-            false
+            return@withContext true
         }
     }
 }

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

@@ -42,7 +42,6 @@ interface AdsjsMessaging {
     /**
      * Sends a message to the JS layer.
      * @param subscriptionEventData Data to be sent.
-     * @return true if the message was sent successfully, false otherwise.
      */
     suspend fun postMessage(subscriptionEventData: SubscriptionEventData): Boolean