Refine postMessage fallback

Author: CrisBarreiro

content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/AdsjsMessagingContentScopeJsMessageHandler.kt renamed to content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/WebViewCompatMessagingContentScopeJsMessageHandler.kt

@@ -16,23 +16,23 @@
 
 package com.duckduckgo.contentscopescripts.impl
 
-import com.duckduckgo.contentscopescripts.api.AdsjsContentScopeJsMessageHandlersPlugin
+import com.duckduckgo.contentscopescripts.api.WebCompatContentScopeJsMessageHandlersPlugin
 import com.duckduckgo.di.scopes.ActivityScope
-import com.duckduckgo.js.messaging.api.AdsjsJsMessageCallback
-import com.duckduckgo.js.messaging.api.AdsjsMessageHandler
 import com.duckduckgo.js.messaging.api.JsMessage
+import com.duckduckgo.js.messaging.api.WebCompatMessageHandler
+import com.duckduckgo.js.messaging.api.WebViewCompatMessageCallback
 import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject
 import org.json.JSONObject
 
 @ContributesMultibinding(ActivityScope::class)
-class AdsjsMessagingContentScopeJsMessageHandler @Inject constructor() : AdsjsContentScopeJsMessageHandlersPlugin {
+class WebViewCompatMessagingContentScopeJsMessageHandler @Inject constructor() : WebCompatContentScopeJsMessageHandlersPlugin {
 
-    override fun getJsMessageHandler(): AdsjsMessageHandler = object : AdsjsMessageHandler {
+    override fun getJsMessageHandler(): WebCompatMessageHandler = object : WebCompatMessageHandler {
 
         override fun process(
             jsMessage: JsMessage,
-            jsMessageCallback: AdsjsJsMessageCallback?,
+            jsMessageCallback: WebViewCompatMessageCallback?,
             onResponse: (JSONObject) -> Unit,
         ) {
             jsMessageCallback?.process(featureName, jsMessage.method, jsMessage.id, jsMessage.params, onResponse)

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

@@ -26,6 +26,7 @@ import com.duckduckgo.contentscopescripts.api.GlobalContentScopeJsMessageHandler
 import com.duckduckgo.contentscopescripts.api.WebCompatContentScopeJsMessageHandlersPlugin
 import com.duckduckgo.contentscopescripts.api.WebMessagingPlugin
 import com.duckduckgo.contentscopescripts.impl.AdsJsContentScopeScripts
+import com.duckduckgo.contentscopescripts.impl.ContentScopeScriptsFeature
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.js.messaging.api.WebViewCompatMessageCallback
 import com.duckduckgo.js.messaging.api.JsCallbackData
@@ -36,6 +37,7 @@ import com.squareup.anvil.annotations.ContributesBinding
 import com.squareup.moshi.Moshi
 import javax.inject.Inject
 import javax.inject.Named
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import logcat.LogPriority.ERROR
 import logcat.asLog
@@ -51,6 +53,7 @@ class WebCompatMessagingPlugin @Inject constructor(
     private val globalHandlers: PluginPoint<GlobalContentScopeJsMessageHandlersPlugin>,
     private val adsJsContentScopeScripts: AdsJsContentScopeScripts,
     private val dispatcherProvider: DispatcherProvider,
+    private val contentScopeScriptsFeature: ContentScopeScriptsFeature,
 ) : WebMessagingPlugin {
 
     private val moshi = Moshi.Builder().add(JSONObjectAdapter()).build()
@@ -74,6 +77,7 @@ class WebCompatMessagingPlugin @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
                     }
 
@@ -155,6 +159,16 @@ class WebCompatMessagingPlugin @Inject constructor(
     @SuppressLint("RequiresFeature")
     override fun postMessage(subscriptionEventData: SubscriptionEventData): Boolean {
         return runCatching {
+
+            //TODO (cbarreiro) temporary, remove
+            val newWebCompatApisEnabled = runBlocking {
+                contentScopeScriptsFeature.useNewWebCompatApis().isEnabled()
+            }
+
+            if (!newWebCompatApisEnabled) {
+                return false
+            }
+
             val subscriptionEvent = SubscriptionEvent(
                 context = context,
                 featureName = subscriptionEventData.featureName,