From 430a4e4ae8f46ec30a2c33ef23c3d3d17bed0ede 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 11:52:14 +0200 Subject: [PATCH] fix comment and check url --- .../webview/web_view/BaseWebViewClient.kt | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 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 64eb295..f0d62a0 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,7 +4,12 @@ import android.graphics.Bitmap import android.net.http.SslError import android.os.Handler import android.os.Looper -import android.webkit.* +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 androidx.core.os.postDelayed open class BaseWebViewClient(private val callback: WebViewCallback, private val isSslPinningEnable: Boolean) : WebViewClient() { @@ -34,17 +39,18 @@ open class BaseWebViewClient(private val callback: WebViewCallback, private val } /** - * onPageFinished calls always, but after onReceivedError + * onPageFinished вызывается всегда после onReceivedError, + * кроме случая, когда в кэше есть страница для ошибки -2 и сначала вызывается onReceivedError */ override fun onPageFinished(view: WebView, url: String) { super.onPageFinished(view, url) isTimeout = false - if (!isError) { - callback.onPageCookiesLoaded(CookieManager.getInstance().getCookie(url).processCookies()) - } if (url == "about:blank") { isError = true } + if (!isError) { + callback.onPageCookiesLoaded(CookieManager.getInstance().getCookie(url).processCookies()) + } pageFinished() }