Merge remote-tracking branch 'origin/main'

siyuan-note · Jan 7, 2025 · cb3a559 · cb3a559
2 parents 757f663 + 15fc5c7
commit cb3a559
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/src/main/java/org/b3log/siyuan/JSAndroid.java b/app/src/main/java/org/b3log/siyuan/JSAndroid.java
@@ -59,6 +59,11 @@ public String getBlockURL() {
         return blockURL;
     }
 
+    @JavascriptInterface
+    public void setWebViewDebuggingEnabled(final boolean debuggable) {
+        activity.setWebViewDebuggable(debuggable);
+    }
+
     @JavascriptInterface
     public String readClipboard() {
         final ClipboardManager clipboard = (ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE);

diff --git a/app/src/main/java/org/b3log/siyuan/MainActivity.java b/app/src/main/java/org/b3log/siyuan/MainActivity.java
@@ -140,7 +140,7 @@ protected void onCreate(final Bundle savedInstanceState) {
 
         // 使用 Chromium 调试 WebView
         if (Utils.isDebugPackageAndMode(this)) {
-            WebView.setWebContentsDebuggingEnabled(true);
+            this.setWebViewDebuggable(true);
         }
 
         // 注册工具栏显示/隐藏跟随软键盘状态
@@ -709,6 +709,10 @@ private void checkWebViewVer(final WebSettings ws) {
         }
     }
 
+    public void setWebViewDebuggable(final boolean debuggable) {
+        WebView.setWebContentsDebuggingEnabled(debuggable);
+    }
+
     private static boolean syncing;
 
     public static void startSyncData() {