From c2079ebca5c463194f46e40c687ede88abbe7bfa Mon Sep 17 00:00:00 2001 From: Koitharu Date: Mon, 30 Dec 2024 07:51:45 +0200 Subject: [PATCH] Update dependencies --- .../koitharu/kotatsu/browser/BrowserActivity.kt | 2 -- .../browser/cloudflare/CloudFlareActivity.kt | 2 -- .../parser/external/ExternalMangaRepository.kt | 2 +- .../koitharu/kotatsu/core/util/ext/Android.kt | 4 ++++ .../settings/sources/auth/SourceAuthActivity.kt | 2 -- gradle/libs.versions.toml | 16 ++++++++-------- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt index 2e5ad85db..4f9f3e85b 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt @@ -3,7 +3,6 @@ package org.koitharu.kotatsu.browser import android.os.Bundle import android.view.Menu import android.view.MenuItem -import android.webkit.CookieManager import androidx.core.graphics.Insets import androidx.core.view.isVisible import androidx.core.view.updatePadding @@ -43,7 +42,6 @@ class BrowserActivity : BaseActivity(), BrowserCallback val repository = mangaRepositoryFactory.create(mangaSource) as? ParserMangaRepository val userAgent = repository?.getRequestHeaders()?.get(CommonHeaders.USER_AGENT) viewBinding.webView.configureForParser(userAgent) - CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true) viewBinding.webView.webViewClient = BrowserClient(this) viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar) onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt index 4d768100e..5d43a277b 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt @@ -5,7 +5,6 @@ import android.content.Intent import android.os.Bundle import android.view.Menu import android.view.MenuItem -import android.webkit.CookieManager import androidx.activity.result.contract.ActivityResultContract import androidx.core.graphics.Insets import androidx.core.view.isInvisible @@ -63,7 +62,6 @@ class CloudFlareActivity : BaseActivity(), CloudFlareCal onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView).also { onBackPressedDispatcher.addCallback(it) } - CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true) if (savedInstanceState == null) { onTitleChanged(getString(R.string.loading_), url) viewBinding.webView.loadUrl(url) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalMangaRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalMangaRepository.kt index 999725e70..80ad1df5d 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalMangaRepository.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalMangaRepository.kt @@ -42,7 +42,7 @@ class ExternalMangaRepository( override var defaultSortOrder: SortOrder get() = capabilities?.availableSortOrders?.firstOrNull() ?: SortOrder.ALPHABETICAL - set(_) = Unit + set(value) = Unit override suspend fun getFilterOptions(): MangaListFilterOptions = filterOptions.get() diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt index 3cba6819f..01c1f0cba 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt @@ -26,6 +26,7 @@ import android.os.PowerManager import android.provider.Settings import android.view.ViewPropertyAnimator import android.view.Window +import android.webkit.CookieManager import android.webkit.WebView import androidx.activity.result.ActivityResultLauncher import androidx.annotation.CheckResult @@ -264,6 +265,9 @@ fun WebView.configureForParser(userAgentOverride: String?) = with(settings) { if (userAgentOverride != null) { userAgentString = userAgentOverride } + val cookieManager = CookieManager.getInstance() + cookieManager.setAcceptCookie(true) + cookieManager.setAcceptThirdPartyCookies(this@configureForParser, true) } fun Context.restartApplication() { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt index a135c5ca6..50a01749c 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt @@ -5,7 +5,6 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.view.MenuItem -import android.webkit.CookieManager import android.widget.Toast import androidx.activity.result.contract.ActivityResultContract import androidx.core.graphics.Insets @@ -67,7 +66,6 @@ class SourceAuthActivity : BaseActivity(), BrowserCallba setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material) } viewBinding.webView.configureForParser(repository.getRequestHeaders()[CommonHeaders.USER_AGENT]) - CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true) viewBinding.webView.webViewClient = BrowserClient(this) viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar) onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5be0e3b70..25acdb06c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,13 +11,13 @@ collections = "1.4.5" conscrypt = "2.5.2" constraintlayout = "2.2.0" coreKtx = "1.15.0" -coroutines = "1.9.0" +coroutines = "1.10.1" desugar = "2.1.4" diskLruCache = "1.4" fragment = "1.8.5" gradle = "8.7.3" guava = "33.3.1-android" -hilt = "2.53.1" +hilt = "2.54" hiltWork = "1.2.0" json = "20240303" junit = "4.13.2" @@ -31,14 +31,14 @@ material = "1.13.0-alpha09" moshi = "1.15.2" okhttp = "4.12.0" okio = "3.9.1" -parsers = "2550b9cac1" +parsers = "b1b04d2953" preference = "1.2.1" recyclerview = "1.3.2" room = "2.6.1" -rules = "1.6.1" -runner = "1.6.2" ssiv = "ba48c29803" swiperefreshlayout = "1.1.0" +testRules = "1.6.1" +testRunner = "1.6.2" transition = "1.5.1" viewpager2 = "1.1.0" webkit = "1.12.1" @@ -67,10 +67,10 @@ androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "room" } -androidx-rules = { module = "androidx.test:rules", version.ref = "rules" } -androidx-runner = { module = "androidx.test:runner", version.ref = "runner" } +androidx-rules = { module = "androidx.test:rules", version.ref = "testRules" } +androidx-runner = { module = "androidx.test:runner", version.ref = "testRunner" } androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" } -androidx-test-core = { module = "androidx.test:core-ktx", version.ref = "rules" } +androidx-test-core = { module = "androidx.test:core-ktx", version.ref = "testRules" } androidx-transition = { module = "androidx.transition:transition-ktx", version.ref = "transition" } androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" } androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "webkit" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 022a2d23f..ef77a4518 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ #Wed Apr 03 08:23:55 EEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists