From eec1850712b80b484edb888e8c69a205b92f0dce Mon Sep 17 00:00:00 2001 From: Zakhar Timoshenko Date: Sun, 5 Feb 2023 18:30:28 +0300 Subject: [PATCH 1/2] Change user agent to Chrome --- .../java/org/koitharu/kotatsu/browser/BrowserActivity.kt | 2 +- .../koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt | 2 +- .../koitharu/kotatsu/core/network/UserAgentInterceptor.kt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt index 81968d794..5ea45d36b 100644 --- a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt @@ -31,7 +31,7 @@ class BrowserActivity : BaseActivity(), BrowserCallback } with(binding.webView.settings) { javaScriptEnabled = true - userAgentString = UserAgentInterceptor.userAgent + userAgentString = UserAgentInterceptor.userAgentChrome } binding.webView.webViewClient = BrowserClient(this) binding.webView.webChromeClient = ProgressChromeClient(binding.progressBar) diff --git a/app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt b/app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt index c2359ad91..b95eeac99 100644 --- a/app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt +++ b/app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt @@ -42,7 +42,7 @@ class CloudFlareDialog : AlertDialogFragment(), Cloud cacheMode = WebSettings.LOAD_DEFAULT domStorageEnabled = true databaseEnabled = true - userAgentString = UserAgentInterceptor.userAgent + userAgentString = UserAgentInterceptor.userAgentChrome } binding.webView.webViewClient = CloudFlareClient(cookieJar, this, url.orEmpty()) CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webView, true) diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/UserAgentInterceptor.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/UserAgentInterceptor.kt index b6491f154..6a781fd45 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/network/UserAgentInterceptor.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/network/UserAgentInterceptor.kt @@ -13,7 +13,7 @@ class UserAgentInterceptor : Interceptor { return chain.proceed( if (request.header(CommonHeaders.USER_AGENT) == null) { request.newBuilder() - .addHeader(CommonHeaders.USER_AGENT, userAgent) + .addHeader(CommonHeaders.USER_AGENT, userAgentChrome) .build() } else request ) @@ -29,7 +29,7 @@ class UserAgentInterceptor : Interceptor { Build.BRAND, Build.DEVICE, Locale.getDefault().language - ) + ) // TODO Decide what to do with this afterwards val userAgentChrome get() = ( @@ -40,4 +40,4 @@ class UserAgentInterceptor : Interceptor { Build.MODEL, ) } -} \ No newline at end of file +} From 9da5bdaad49f0f6b9263a110b8b6189d2e8a2813 Mon Sep 17 00:00:00 2001 From: Zakhar Timoshenko Date: Sun, 5 Feb 2023 18:30:42 +0300 Subject: [PATCH 2/2] Update parsers --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 1b8ed2bc9..2fea65e6f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -86,7 +86,7 @@ afterEvaluate { } } dependencies { - implementation('com.github.KotatsuApp:kotatsu-parsers:7f630184c0') { + implementation('com.github.KotatsuApp:kotatsu-parsers:c28e2a72d5') { exclude group: 'org.json', module: 'json' }