prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devel' into feature/mal

Browse Source
This commit is contained in:
Zakhar Timoshenko
2023-02-05 18:31:22 +03:00
parent 802ab4c6c1 9da5bdaad4
commit ec137d2513
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -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'
}

2
app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt
View File

@@ -31,7 +31,7 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
}
with(binding.webView.settings) {
javaScriptEnabled = true
userAgentString = UserAgentInterceptor.userAgent
userAgentString = UserAgentInterceptor.userAgentChrome
}
binding.webView.webViewClient = BrowserClient(this)
binding.webView.webChromeClient = ProgressChromeClient(binding.progressBar)

2
app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt
View File

@@ -42,7 +42,7 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), 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)

6
app/src/main/java/org/koitharu/kotatsu/core/network/UserAgentInterceptor.kt
View File

@@ -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,
)
}
}
}