javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Switch to AndroidX Webkit library

Browse Source
This commit is contained in:
arkon
2020-02-15 17:13:17 -05:00
parent 50ef4cc5da
commit abb2e231f6
4 changed files with 37 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt
+31 -11
View File
@@ -5,11 +5,15 @@ import android.content.Context
import android.os.Build
import android.os.Handler
import android.os.Looper
import android.webkit.WebResourceRequest
import android.webkit.WebResourceResponse
import android.webkit.WebSettings
import android.webkit.WebView
import android.widget.Toast
import androidx.webkit.WebResourceErrorCompat
import androidx.webkit.WebViewClientCompat
import androidx.webkit.WebViewFeature
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.util.system.WebViewClientCompat
import eu.kanade.tachiyomi.util.system.isOutdated
import eu.kanade.tachiyomi.util.system.toast
import okhttp3.Cookie
@@ -97,8 +101,9 @@ class CloudflareInterceptor(private val context: Context) : Interceptor {
cloudflareBypassed = true
latch.countDown()
}
// Http error codes are only received since M
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
// HTTP error codes are only received since M
if (WebViewFeature.isFeatureSupported(WebViewFeature.RECEIVE_WEB_RESOURCE_ERROR) &&
url == origRequestUrl && !challengeFound
) {
// The first request didn't return the challenge, abort.
@@ -106,16 +111,31 @@ class CloudflareInterceptor(private val context: Context) : Interceptor {
}
}
override fun onReceivedErrorCompat(
override fun onReceivedHttpError(
view: WebView,
errorCode: Int,
description: String?,
failingUrl: String,
isMainFrame: Boolean
request: WebResourceRequest,
errorResponse: WebResourceResponse
) {
if (isMainFrame) {
if (errorCode == 503) {
// Found the cloudflare challenge page.
if (request.isForMainFrame) {
if (errorResponse.statusCode == 503) {
// Found the Cloudflare challenge page.
challengeFound = true
} else {
// Unlock thread, the challenge wasn't found.
latch.countDown()
}
}
}
@SuppressLint("RequiresFeature")
override fun onReceivedError(
view: WebView,
request: WebResourceRequest,
error: WebResourceErrorCompat
) {
if (request.isForMainFrame) {
if (error.errorCode == 503) {
// Found the Cloudflare challenge page.
challengeFound = true
} else {
// Unlock thread, the challenge wasn't found.