feat(android): apply navigation handler to loadUrl calls (#974)

tauri-apps · Jun 19, 2023 · 4ab2a45 · 4ab2a45
1 parent 5d08eb7
commit 4ab2a45
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/.cargo/android-navigation-handler-improvements.md b/.cargo/android-navigation-handler-improvements.md
@@ -0,0 +1,5 @@
+---
+"wry": "patch"
+---
+
+Make `WebViewBuilder::with_navigation_handler` apply to Android `loadUrl` calls.
diff --git a/src/webview/android/kotlin/RustWebView.kt b/src/webview/android/kotlin/RustWebView.kt
@@ -23,13 +23,25 @@ class RustWebView(context: Context): WebView(context) {
 
     fun loadUrlMainThread(url: String) {
         post {
-          super.loadUrl(url)
+          loadUrl(url)
         }
     }
 
     fun loadUrlMainThread(url: String, additionalHttpHeaders: Map<String, String>) {
         post {
-          super.loadUrl(url, additionalHttpHeaders)
+          loadUrl(url, additionalHttpHeaders)
+        }
+    }
+
+    override fun loadUrl(url: String) {
+        if (!shouldOverride(url)) {
+            super.loadUrl(url);
+        }
+    }
+
+    override fun loadUrl(url: String, additionalHttpHeaders: Map<String, String>) {
+        if (!shouldOverride(url)) {
+            super.loadUrl(url, additionalHttpHeaders);
         }
     }
 
@@ -61,5 +73,7 @@ class RustWebView(context: Context): WebView(context) {
         settings.userAgentString = ua
     }
 
+    private external fun shouldOverride(url: String): Boolean
+
     {{class-extension}}
 }
diff --git a/src/webview/android/mod.rs b/src/webview/android/mod.rs
@@ -82,6 +82,14 @@ macro_rules! android_binding {
       [JString],
       jboolean
     );
+    android_fn!(
+      $domain,
+      $package,
+      RustWebView,
+      shouldOverride,
+      [JString],
+      jboolean
+    );
     android_fn!($domain, $package, Ipc, ipc, [JString]);
     android_fn!(
       $domain,