From c0a80f1be23a20f0075927ec2d627ba7b7dd94f3 Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Sun, 3 Sep 2023 21:10:21 +0200 Subject: [PATCH] Better hint for error stack trace DevTools cannot handle local://ChromeXt:num:num correctly --- app/src/main/java/org/matrix/chromext/hook/UserScript.kt | 2 +- app/src/main/java/org/matrix/chromext/hook/WebView.kt | 2 +- app/src/main/java/org/matrix/chromext/script/Manager.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/matrix/chromext/hook/UserScript.kt b/app/src/main/java/org/matrix/chromext/hook/UserScript.kt index b52e4a0f..1be2ea08 100644 --- a/app/src/main/java/org/matrix/chromext/hook/UserScript.kt +++ b/app/src/main/java/org/matrix/chromext/hook/UserScript.kt @@ -45,7 +45,7 @@ object UserScriptHook : BaseHook() { val lineNumber = it.args[2] as Int val sourceId = it.args[3] as String if (it.args[0] as Int == 0 && - sourceId == "local://ChromeXt" && + sourceId == "local://ChromeXt/init" && lineNumber == Local.anchorInChromeXt) { Listener.startAction(it.args[1] as String, proxy.getTab(it.thisObject)) } else { diff --git a/app/src/main/java/org/matrix/chromext/hook/WebView.kt b/app/src/main/java/org/matrix/chromext/hook/WebView.kt index 32e17161..06c9502d 100644 --- a/app/src/main/java/org/matrix/chromext/hook/WebView.kt +++ b/app/src/main/java/org/matrix/chromext/hook/WebView.kt @@ -37,7 +37,7 @@ object WebViewHook : BaseHook() { // This should be the way to communicate with the front-end of ChromeXt val consoleMessage = it.args[0] as ConsoleMessage if (consoleMessage.messageLevel() == ConsoleMessage.MessageLevel.TIP && - consoleMessage.sourceId() == "local://ChromeXt" && + consoleMessage.sourceId() == "local://ChromeXt/init" && consoleMessage.lineNumber() == Local.anchorInChromeXt) { Listener.startAction(consoleMessage.message()) } else { diff --git a/app/src/main/java/org/matrix/chromext/script/Manager.kt b/app/src/main/java/org/matrix/chromext/script/Manager.kt index 8baee305..6c46522f 100644 --- a/app/src/main/java/org/matrix/chromext/script/Manager.kt +++ b/app/src/main/java/org/matrix/chromext/script/Manager.kt @@ -131,7 +131,7 @@ object ScriptDbManager { } } if (runScripts) codes.add("ChromeXt.lock(${Local.key});") - codes.add("//# sourceURL=local://ChromeXt") + codes.add("//# sourceURL=local://ChromeXt/init") webSettings?.javaScriptEnabled = true Chrome.evaluateJavascript(listOf(codes.joinToString("\n")), null, bypassSandbox, bypassSandbox) if (runScripts) {