Merge branch 'feat/mobile-multi-webview' into feat/android-on-new-intent

Author: lucasfernog

src/android/kotlin/RustWebViewClient.kt

@@ -15,6 +15,7 @@ import androidx.webkit.WebViewAssetLoader
 class RustWebViewClient(webView: RustWebView, context: Context): WebViewClient() {
     private val interceptedState = mutableMapOf<String, Boolean>()
     var currentUrl: String = "about:blank"
+    private var lastInterceptedUrl: Uri? = null
     private var pendingUrlRedirect: String? = null
 
     private val assetLoader = WebViewAssetLoader.Builder()
@@ -34,10 +35,18 @@ class RustWebViewClient(webView: RustWebView, context: Context): WebViewClient()
             return null
         }
 
+        lastInterceptedUrl = request.url
         return if (Rust.withAssetLoader((view as RustWebView).id)) {
             assetLoader.shouldInterceptRequest(request.url)
         } else {
             val response = Rust.handleRequest(view.id, request, view.isDocumentStartScriptEnabled)
+            if (response != null) {
+                if (response.responseHeaders != null) {
+                    response.responseHeaders["Cache-Control"] = "no-store"
+                } else {
+                    response.responseHeaders = mapOf("Cache-Control" to "no-store")
+                }
+            }
             interceptedState[request.url.toString()] = response != null
             return response
         }
@@ -73,17 +82,13 @@ class RustWebViewClient(webView: RustWebView, context: Context): WebViewClient()
         // we get a net::ERR_CONNECTION_REFUSED when an external URL redirects to a custom protocol
         // e.g. oauth flow, because shouldInterceptRequest is not called on redirects
         // so we must force retry here with loadUrl() to get a chance of the custom protocol to kick in
-        // 
-        // we also get a net::ERR_CONNECTION_REFUSED when a second webview tries to load http://tauri.localhost
-        // so we retry the currentUrl regardless. We do not have a timeout yet due to the amount of retries needed to make it work
-        // but we might add a timeout in the future
-        if (error.errorCode == ERROR_CONNECT) {
+        if (error.errorCode == ERROR_CONNECT && request.isForMainFrame && request.url != lastInterceptedUrl) {
             // prevent the default error page from showing
             view.stopLoading()
             // without this initial loadUrl the app is stuck
-            view.loadUrl(currentUrl)
+            view.loadUrl(request.url.toString())
             // ensure the URL is actually loaded - for some reason there's a race condition and we need to call loadUrl() again later
-            pendingUrlRedirect = currentUrl
+            pendingUrlRedirect = request.url.toString()
         } else {
             super.onReceivedError(view, request, error)
         }