From b28840df8759547a7c9b14413a36778b32ee51b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=B2=D0=B0=D0=BB=D1=8C=D0=B4=20?= =?UTF-8?q?=D0=94=D1=8D=D0=BD=D0=B8=D1=81?= Date: Wed, 26 May 2021 14:58:17 +0200 Subject: [PATCH] fix comment and onReceivedError useless check error code --- .../webview/web_view/BaseWebViewClient.kt | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebViewClient.kt b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebViewClient.kt index f0d62a0..5e5f7a2 100644 --- a/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebViewClient.kt +++ b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebViewClient.kt @@ -4,12 +4,7 @@ import android.graphics.Bitmap import android.net.http.SslError import android.os.Handler import android.os.Looper -import android.webkit.CookieManager -import android.webkit.SslErrorHandler -import android.webkit.WebResourceError -import android.webkit.WebResourceRequest -import android.webkit.WebView -import android.webkit.WebViewClient +import android.webkit.* import androidx.core.os.postDelayed open class BaseWebViewClient(private val callback: WebViewCallback, private val isSslPinningEnable: Boolean) : WebViewClient() { @@ -39,8 +34,8 @@ open class BaseWebViewClient(private val callback: WebViewCallback, private val } /** - * onPageFinished вызывается всегда после onReceivedError, - * кроме случая, когда в кэше есть страница для ошибки -2 и сначала вызывается onReceivedError + * onPageFinished is always called after onReceivedError, + * except when there is a error page in the cache and onReceivedError is called first */ override fun onPageFinished(view: WebView, url: String) { super.onPageFinished(view, url) @@ -72,9 +67,7 @@ open class BaseWebViewClient(private val callback: WebViewCallback, private val * onReceivedError isn't called when url is "about:blank" (url string isBlank) */ override fun onReceivedError(view: WebView, request: WebResourceRequest, error: WebResourceError) { - if (error.errorCode != -10 || error.errorCode == -2) { - isError = true - } + isError = true } private fun pageFinished() {