Simplify JS setup

Author: CrisBarreiro

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

@@ -3388,9 +3388,9 @@ class BrowserTabFragment :
                 val useDedicatedWebMessageListener = webViewCompatTestHelper.useDedicatedWebMessageListener()
 
                 val script = if (useDedicatedWebMessageListener) {
-                    blobDownloadScriptOriginal()
-                } else {
                     blobDownloadScript()
+                } else {
+                    blobDownloadScriptForWebViewCompatTest()
                 }
                 WebViewCompat.addDocumentStartJavaScript(webView, script, setOf("*"))
 
@@ -3449,27 +3449,10 @@ class BrowserTabFragment :
         }
     }
 
-    private fun blobDownloadScript(): String {
+    private fun blobDownloadScriptForWebViewCompatTest(): String {
         val script =
             """
             (function() {
-                // Capture the injected object immediately
-                const ddgBlob = window.ddgBlobDownloadObj;
-
-                if (!ddgBlob) {
-                    console.error('ddgBlobDownloadObj not found');
-                    return;
-                }
-
-                try {
-                    Object.defineProperty(window, 'ddgBlobDownloadObj', {
-                        value: ddgBlob,
-                        writable: false,
-                        configurable: false,
-                    });
-                } catch (e) {
-                    console.warn('Could not protect ddgBlobDownloadObj:', e);
-                }
 
                 const urlToBlobCollection = {};
 
@@ -3498,17 +3481,17 @@ class BrowserTabFragment :
                 }
 
                 const pingMessage = 'Ping:' + window.location.href;
-                ddgBlob.postMessage(pingMessage);
+                window.ddgBlobDownloadObj.postMessage(pingMessage);
                 console.log('Sent ping message for blob downloads: ' + pingMessage);
 
-                ddgBlob.addEventListener('message', function(event) {
+                window.ddgBlobDownloadObj.addEventListener('message', function(event) {
                     if (event.data.startsWith('blob:')) {
                         console.log(event.data);
                         const blob = urlToBlobCollection[event.data];
                         if (blob) {
                             blobToBase64DataUrl(blob).then((dataUrl) => {
                                 console.log('Sending data URL back to native ' + dataUrl);
-                                ddgBlob.postMessage(dataUrl);
+                                window.ddgBlobDownloadObj.postMessage(dataUrl);
                             });
                         } else {
                             console.log('No Blob found for URL: ' + event.data);
@@ -3521,7 +3504,7 @@ class BrowserTabFragment :
         return script
     }
 
-    private fun blobDownloadScriptOriginal(): String {
+    private fun blobDownloadScript(): String {
         val script =
             """
             window.__url_to_blob_collection = {};

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

@@ -65,7 +65,7 @@ class RealWebViewCompatTestHelper @Inject constructor(
     private val webViewCompatFeature: WebViewCompatFeature,
     private val webViewCompatWrapper: WebViewCompatWrapper,
     moshi: Moshi,
-    @AppCoroutineScope private val appCoroutineScope: CoroutineScope
+    @AppCoroutineScope private val appCoroutineScope: CoroutineScope,
 ) : WebViewCompatTestHelper {
 
     private var proxy: JavaScriptReplyProxy? = null
@@ -83,7 +83,7 @@ class RealWebViewCompatTestHelper @Inject constructor(
     private val webViewCompatConfigDeferred by lazy {
         appCoroutineScope.async(dispatchers.io()) {
             if (!webViewCompatFeature.self().isEnabled()) return@async null
-                WebViewCompatConfig(
+            WebViewCompatConfig(
                 settings = webViewCompatFeature.self().getSettings()?.let {
                     adapter.fromJson(it)
                 },
@@ -126,13 +126,11 @@ class RealWebViewCompatTestHelper @Inject constructor(
                 webView.context.resources?.openRawResource(R.raw.webviewcompat_test_script)
                     ?.bufferedReader().use { it?.readText() }.orEmpty()
                     .replace(delay, config.settings?.jsInitialPingDelay?.toString() ?: "0")
-                    .replace(com.duckduckgo.app.browser.postInitialPing, config.jsSendsInitialPing.toString())
-                    .replace(com.duckduckgo.app.browser.replyToNativeMessages, config.jsRepliesToNativeMessages.toString())
+                    .replace(postInitialPing, config.jsSendsInitialPing.toString())
+                    .replace(replyToNativeMessages, config.jsRepliesToNativeMessages.toString())
                     .replace(objectName, if (useDedicatedListener) "webViewCompatTestObj" else "ddgBlobDownloadObj")
             }
 
-            // logcat("Cris") {"Script: $script"}
-
             webViewCompatWrapper.addDocumentStartJavaScript(webView, script, setOf("*"))
 
             if (useDedicatedListener) {

app/src/main/res/raw/webviewcompat_test_script.js

@@ -2,22 +2,6 @@
     // Capture the injected object immediately
     const ddgObj = window.$OBJECT_NAME$;
 
-    if (!ddgObj) {
-        console.error('$OBJECT_NAME$ not found');
-        return;
-    }
-
-    // Make it read-only to prevent overwrites (don't delete - other scripts may need it)
-    try {
-        Object.defineProperty(window, '$OBJECT_NAME$', {
-            value: ddgObj,
-            writable: false,
-            configurable: false,
-        });
-    } catch (e) {
-        console.warn('Could not protect $OBJECT_NAME$:', e);
-    }
-
     const supportedMessages = ["ContextMenuOpened", "PageStarted"];
 
     const delay = $DELAY$;