Merge pull request #323 from hotwired/ssl-errors

Only show error screens for SSL errors when the url matches the current visit
hotwired · Mar 23, 2024 · bb636d6 · bb636d6
2 parents a70e702 + 3bf26ca
commit bb636d6
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/turbo/src/main/kotlin/dev/hotwire/turbo/session/TurboSession.kt b/turbo/src/main/kotlin/dev/hotwire/turbo/session/TurboSession.kt
@@ -783,10 +783,12 @@ class TurboSession internal constructor(
             handler.cancel()
 
             val visitError = WebSslError.from(error)
+            logEvent("onReceivedSslError", "error" to visitError, "url" to error.url)
 
-            logEvent("onReceivedSslError", "error" to visitError)
-            reset()
-            callback { it.onReceivedError(visitError) }
+            if (currentVisit?.location == error.url) {
+                reset()
+                callback { it.onReceivedError(visitError) }
+            }
         }
 
         override fun onRenderProcessGone(view: WebView, detail: RenderProcessGoneDetail): Boolean {