Post messages from DDGWebView

Author: CrisBarreiro

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

@@ -47,7 +47,6 @@ import javax.inject.Inject
 import logcat.LogPriority.ERROR
 import logcat.asLog
 import logcat.logcat
-import org.json.JSONObject
 
 /**
  * WebView subclass which allows the WebView to
@@ -478,11 +477,11 @@ class RealDuckDuckGoWebView : DuckDuckGoWebView, NestedScrollingChild3 {
     @SuppressLint("RequiresFeature")
     override suspend fun safePostMessage(
         replyProxy: JavaScriptReplyProxy,
-        response: JSONObject,
+        response: String,
     ) {
         runCatching {
             if (webViewCapabilityChecker.isSupported(WebViewCapability.WebMessageListener)) {
-                replyProxy.postMessage(response.toString())
+                replyProxy.postMessage(response)
             }
         }.getOrElse { exception ->
             logcat(ERROR) { "Error posting message: ${exception.asLog()}" }

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

@@ -26,7 +26,6 @@ import android.webkit.WebView
 import androidx.webkit.JavaScriptReplyProxy
 import androidx.webkit.ScriptHandler
 import androidx.webkit.WebViewCompat.WebMessageListener
-import org.json.JSONObject
 
 abstract class DuckDuckGoWebView(
     context: Context,
@@ -59,6 +58,6 @@ abstract class DuckDuckGoWebView(
 
     abstract suspend fun safePostMessage(
         replyProxy: JavaScriptReplyProxy,
-        response: JSONObject,
+        response: String,
     )
 }

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

@@ -160,13 +160,12 @@ class AdsjsContentScopeMessaging @Inject constructor(
             appCoroutineScope.launch(dispatcherProvider.main()) {
                 (webView as? DuckDuckGoWebView)?.safePostMessage(
                     replyProxy,
-                    responseWithId,
+                    responseWithId.toString(),
                 )
             }
         }
     }
 
-    @SuppressLint("RequiresFeature")
     override fun postMessage(subscriptionEventData: SubscriptionEventData) {
         runCatching {
             val subscriptionEvent = SubscriptionEvent(
@@ -178,7 +177,14 @@ class AdsjsContentScopeMessaging @Inject constructor(
                 moshi.adapter(SubscriptionEvent::class.java).toJson(it)
             }
 
-            globalReplyProxy?.postMessage(subscriptionEvent)
+            appCoroutineScope.launch(dispatcherProvider.main()) {
+                globalReplyProxy?.let {
+                    (webView as? DuckDuckGoWebView)?.safePostMessage(
+                        it,
+                        subscriptionEvent,
+                    )
+                }
+            }
         }
     }
 }