diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt index cc15f5731..5643f8720 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt @@ -210,16 +210,13 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor lateinit var application: EhApplication private set - @JvmStatic - val ehCookieStore by lazy { EhCookieStore } - @JvmStatic val ehProxySelector by lazy { EhProxySelector() } @JvmStatic val okHttpClient by lazy { val builder = OkHttpClient.Builder() - .cookieJar(ehCookieStore) + .cookieJar(EhCookieStore) .dns(EhDns) .proxySelector(ehProxySelector) diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhUtils.kt b/app/src/main/java/com/hippo/ehviewer/client/EhUtils.kt index ccc728117..09c0d6178 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhUtils.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/EhUtils.kt @@ -16,7 +16,6 @@ package com.hippo.ehviewer.client import android.text.TextUtils -import com.hippo.ehviewer.EhApplication.Companion.ehCookieStore import com.hippo.ehviewer.Settings import com.hippo.ehviewer.client.data.GalleryInfo import java.util.regex.Pattern @@ -111,7 +110,7 @@ object EhUtils { } fun signOut() { - ehCookieStore.signOut() + EhCookieStore.signOut() Settings.putAvatar(null) Settings.putDisplayName(null) Settings.putGallerySite(EhUrl.SITE_E) @@ -120,7 +119,7 @@ object EhUtils { } fun needSignedIn(): Boolean { - return Settings.needSignIn && !ehCookieStore.hasSignedIn() + return Settings.needSignIn && !EhCookieStore.hasSignedIn() } @JvmStatic diff --git a/app/src/main/java/com/hippo/ehviewer/dailycheck/DailyCheckWork.kt b/app/src/main/java/com/hippo/ehviewer/dailycheck/DailyCheckWork.kt index 0dea8eba6..a45a36485 100644 --- a/app/src/main/java/com/hippo/ehviewer/dailycheck/DailyCheckWork.kt +++ b/app/src/main/java/com/hippo/ehviewer/dailycheck/DailyCheckWork.kt @@ -17,6 +17,7 @@ import androidx.work.WorkerParameters import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings +import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhEngine import eu.kanade.tachiyomi.util.lang.withIOContext import java.time.Duration @@ -25,7 +26,7 @@ import java.time.LocalDateTime import java.time.temporal.ChronoUnit private val signedIn - get() = EhApplication.ehCookieStore.hasSignedIn() + get() = EhCookieStore.hasSignedIn() private const val CHANNEL_ID = "DailyCheckNotification" diff --git a/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt index 25195f568..3a266aeb2 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt +++ b/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt @@ -20,7 +20,6 @@ import android.content.DialogInterface import android.text.Html import android.util.AttributeSet import androidx.appcompat.app.AlertDialog -import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.R import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhUrl @@ -40,7 +39,7 @@ class AccountPreference @JvmOverloads constructor( private var message: String? = null init { - val store = EhApplication.ehCookieStore + val store = EhCookieStore val eCookies = store.getCookies(EhUrl.HOST_E.toHttpUrl()) val exCookies = store.getCookies(EhUrl.HOST_EX.toHttpUrl()) val cookies: MutableList = LinkedList(eCookies) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/MyTagsFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/MyTagsFragment.java index 4b0a83155..0ba028f16 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/MyTagsFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/MyTagsFragment.java @@ -84,7 +84,7 @@ public class MyTagsFragment extends BaseFragment { // Copy cookies from okhttp cookie store to CookieManager url = EhUrl.getMyTagsUrl(); - EhCookieStore store = EhApplication.getEhCookieStore(); + EhCookieStore store = EhCookieStore.INSTANCE; for (Cookie cookie : store.getCookies(HttpUrl.parse(url))) { cookieManager.setCookie(url, cookie.toString()); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/UConfigFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/UConfigFragment.kt index 00f6fdd3b..ddfde3b82 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/UConfigFragment.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/UConfigFragment.kt @@ -33,8 +33,8 @@ import android.webkit.WebViewClient import androidx.core.view.MenuProvider import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope -import com.hippo.ehviewer.EhApplication.Companion.ehCookieStore import com.hippo.ehviewer.R +import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhCookieStore.KEY_SETTINGS_PROFILE import com.hippo.ehviewer.client.EhUrl import com.hippo.ehviewer.databinding.ActivityWebviewBinding @@ -101,7 +101,7 @@ class UConfigFragment : BaseFragment() { cookieManager.removeSessionCookies(null) // Copy cookies from okhttp cookie store to CookieManager - val store = ehCookieStore + val store = EhCookieStore for (cookie in store.getCookies(url.toHttpUrl())) { cookieManager.setCookie(url, cookie.toString()) } @@ -134,7 +134,7 @@ class UConfigFragment : BaseFragment() { val cookieManager = CookieManager.getInstance() val cookiesString = cookieManager.getCookie(url) if (!cookiesString.isNullOrEmpty()) { - val store = ehCookieStore + val store = EhCookieStore val hostUrl = EhUrl.host.toHttpUrl() lifecycleScope.launchIO { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt index 16486286d..7458392b6 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt @@ -90,7 +90,7 @@ fun CookieSignInScene() { fun storeCookie(id: String, hash: String, igneous: String) { EhUtils.signOut() - val store = EhApplication.ehCookieStore + val store = EhCookieStore store.addCookie(newCookie(EhCookieStore.KEY_IPB_MEMBER_ID, id, EhUrl.DOMAIN_E)) store.addCookie(newCookie(EhCookieStore.KEY_IPB_MEMBER_ID, id, EhUrl.DOMAIN_EX)) store.addCookie(newCookie(EhCookieStore.KEY_IPB_PASS_HASH, hash, EhUrl.DOMAIN_E)) @@ -127,7 +127,7 @@ fun CookieSignInScene() { navController.navigate(SELECT_SITE_ROUTE_NAME) } }.onFailure { - EhApplication.ehCookieStore.signOut() + EhCookieStore.signOut() loginErrorException = it showErrorDialog = true isProgressIndicatorVisible = false diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/WebviewSignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/WebviewSignInScreen.kt index b899dce71..4a5327700 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/login/WebviewSignInScreen.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/login/WebviewSignInScreen.kt @@ -10,7 +10,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.viewinterop.AndroidView -import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhUrl import com.hippo.ehviewer.client.EhUtils @@ -69,7 +68,7 @@ fun WebviewSignInScreen() { } fun addCookie(domain: String, cookie: Cookie) { - EhApplication.ehCookieStore.addCookie( + EhCookieStore.addCookie( EhCookieStore.newCookie( cookie, domain, diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt index 3a879ffec..b68c05037 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt @@ -55,13 +55,13 @@ import com.hippo.app.BaseDialogBuilder import com.hippo.app.CheckBoxDialogBuilder import com.hippo.app.EditTextDialogBuilder import com.hippo.ehviewer.EhApplication -import com.hippo.ehviewer.EhApplication.Companion.ehCookieStore import com.hippo.ehviewer.EhApplication.Companion.galleryDetailCache import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings import com.hippo.ehviewer.UrlOpener import com.hippo.ehviewer.client.EhClient +import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhFilter import com.hippo.ehviewer.client.EhRequest import com.hippo.ehviewer.client.EhTagDatabase @@ -1642,7 +1642,7 @@ class GalleryDetailScene : CollapsingToolbarScene(), View.OnClickListener, Downl FileUtils.sanitizeFilename("$name.torrent") ) r.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED) - r.addRequestHeader("Cookie", ehCookieStore.getCookieHeader(url.toHttpUrl())) + r.addRequestHeader("Cookie", EhCookieStore.getCookieHeader(url.toHttpUrl())) val dm = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager try { dm.enqueue(r)