Element Call: display error dialog only when loading the main URL (#3962

)
element-hq · Nov 28, 2024 · 67be3f0 · 67be3f0
1 parent 5610b19
commit 67be3f0
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/...ain/kotlin/io/element/android/features/call/impl/utils/WebViewWidgetMessageInterceptor.kt b/...ain/kotlin/io/element/android/features/call/impl/utils/WebViewWidgetMessageInterceptor.kt
@@ -66,19 +66,34 @@ class WebViewWidgetMessageInterceptor(
             override fun onReceivedError(view: WebView?, request: WebResourceRequest?, error: WebResourceError?) {
                 // No network for instance, transmit the error
                 Timber.e("onReceivedError error: ${error?.errorCode} ${error?.description}")
-                onError(error?.description?.toString())
+
+                // Only propagate the error if it happens while loading the current page
+                if (view?.url == request?.url.toString()) {
+                    onError(error?.description.toString())
+                }
+
                 super.onReceivedError(view, request, error)
             }
 
             override fun onReceivedHttpError(view: WebView?, request: WebResourceRequest?, errorResponse: WebResourceResponse?) {
                 Timber.e("onReceivedHttpError error: ${errorResponse?.statusCode} ${errorResponse?.reasonPhrase}")
-                onError(errorResponse?.statusCode.toString())
+
+                // Only propagate the error if it happens while loading the current page
+                if (view?.url == request?.url.toString()) {
+                    onError(errorResponse?.statusCode.toString())
+                }
+
                 super.onReceivedHttpError(view, request, errorResponse)
             }
 
             override fun onReceivedSslError(view: WebView?, handler: SslErrorHandler?, error: SslError?) {
                 Timber.e("onReceivedSslError error: ${error?.primaryError}")
-                onError(error?.primaryError?.toString())
+
+                // Only propagate the error if it happens while loading the current page
+                if (view?.url == error?.url.toString()) {
+                    onError(error?.toString())
+                }
+
                 super.onReceivedSslError(view, handler, error)
             }
         }