Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Custom Cloudflare failure exception to avoid user-facing "java.lang.Exception" text

Browse Source 
(cherry picked from commit 938339690eecdfe309d83264b6a89aff3c767687)
This commit is contained in:
arkon 2022-01-02 17:57:20 -05:00 committed by Jobobby04
parent 867eed7b16
commit f8e128f975
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
View File

@ -77,9 +77,12 @@ class CloudflareInterceptor(private val context: Context) : Interceptor {
resolveWithWebView(originalRequest, oldCookie)
return chain.proceed(originalRequest)
}
// Because OkHttp's enqueue only handles IOExceptions, wrap the exception so that
// we don't crash the entire app
catch (e: CloudflareBypassException) {
throw IOException(context.getString(R.string.information_cloudflare_bypass_failure))
} catch (e: Exception) {
// Because OkHttp's enqueue only handles IOExceptions, wrap the exception so that
// we don't crash the entire app
throw IOException(e)
}
}
@ -171,7 +174,7 @@ class CloudflareInterceptor(private val context: Context) : Interceptor {
context.toast(R.string.information_webview_outdated, Toast.LENGTH_LONG)
}
throw Exception(context.getString(R.string.information_cloudflare_bypass_failure))
throw CloudflareBypassException()
}
}
@ -181,3 +184,5 @@ class CloudflareInterceptor(private val context: Context) : Interceptor {
private val COOKIE_NAMES = listOf("cf_clearance")
}
}
private class CloudflareBypassException : Exception()