fix(android): moved currentUrl assignment to onPageStarted (#1275)

tauri-apps · May 22, 2024 · b6863ed · b6863ed
1 parent 637289d
commit b6863ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changes/currentUrl.md b/.changes/currentUrl.md
@@ -0,0 +1,5 @@
+---
+"wry": patch
+---
+
+On Android, set `RustWebViewClient.currentUrl` field early in `onPageStarted` method instead of `onPageFinished`
diff --git a/src/android/kotlin/RustWebViewClient.kt b/src/android/kotlin/RustWebViewClient.kt
@@ -39,6 +39,7 @@ class RustWebViewClient(context: Context): WebViewClient() {
     }
 
     override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
+        currentUrl = url
         if (interceptedState[url] == false) {
             val webView = view as RustWebView
             for (script in webView.initScripts) {
@@ -49,7 +50,6 @@ class RustWebViewClient(context: Context): WebViewClient() {
     }
 
     override fun onPageFinished(view: WebView, url: String) {
-        currentUrl = url
         return onPageLoaded(url)
     }