fix: webview loading crash
This commit is contained in:
parent
39d6f0fbd6
commit
6a8e422a30
4 changed files with 17 additions and 11 deletions
|
@ -11,7 +11,7 @@ class CloudFlare(override val location: FileUrl) : WebViewBottomDialog() {
|
|||
override var title = "Cloudflare Bypass"
|
||||
override val webViewClient = object : WebViewClient() {
|
||||
override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
|
||||
val cookie = cookies.getCookie(url.toString())
|
||||
val cookie = cookies?.getCookie(url.toString())
|
||||
if (cookie?.contains(cfTag) == true) {
|
||||
val clearance = cookie.substringAfter("$cfTag=").substringBefore(";")
|
||||
privateCallback.invoke(mapOf(cfTag to clearance))
|
||||
|
|
|
@ -34,8 +34,8 @@ class CookieCatcher : AppCompatActivity() {
|
|||
|
||||
val webView = findViewById<WebView>(R.id.discordWebview)
|
||||
|
||||
val cookies: CookieManager = Injekt.get<NetworkHelper>().cookieJar.manager
|
||||
cookies.setAcceptThirdPartyCookies(webView, true)
|
||||
val cookies: CookieManager? = Injekt.get<NetworkHelper>().cookieJar.manager
|
||||
cookies?.setAcceptThirdPartyCookies(webView, true)
|
||||
|
||||
webView.apply {
|
||||
settings.javaScriptEnabled = true
|
||||
|
|
|
@ -33,7 +33,7 @@ abstract class WebViewBottomDialog : BottomSheetDialogFragment() {
|
|||
dismiss()
|
||||
}
|
||||
|
||||
val cookies: CookieManager = Injekt.get<NetworkHelper>().cookieJar.manager
|
||||
val cookies: CookieManager? = Injekt.get<NetworkHelper>().cookieJar.manager
|
||||
//CookieManager.getInstance()
|
||||
|
||||
override fun onCreateView(
|
||||
|
@ -52,7 +52,7 @@ abstract class WebViewBottomDialog : BottomSheetDialogFragment() {
|
|||
javaScriptEnabled = true
|
||||
userAgentString = defaultHeaders["User-Agent"]
|
||||
}
|
||||
cookies.setAcceptThirdPartyCookies(binding.webView, true)
|
||||
cookies?.setAcceptThirdPartyCookies(binding.webView, true)
|
||||
binding.webView.webViewClient = webViewClient
|
||||
binding.webView.loadUrl(location.url, location.headers)
|
||||
this.dismiss()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue