diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt index efc850f4d..c8afd555e 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt @@ -61,7 +61,6 @@ import io.ktor.client.plugins.cookies.HttpCookies import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi -import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.OkHttpClient import java.net.InetAddress import java.net.InetSocketAddress @@ -152,14 +151,8 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor if (!Settings.getRequestNews()) { return } - val store = ehCookieStore - val eh = EhUrl.HOST_E.toHttpUrl() - if (store.contains(eh, EhCookieStore.KEY_IPD_MEMBER_ID) || store.contains( - eh, - EhCookieStore.KEY_IPD_PASS_HASH - ) - ) { + if (ehCookieStore.hasSignedIn()) { val referer = EhUrl.REFERER_E val request = EhRequestBuilder(EhUrl.HOST_E + "news.php", referer).build() val call = okHttpClient.newCall(request) diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.kt b/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.kt index ba9a77b89..9017a0bb0 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.kt @@ -42,12 +42,12 @@ object EhCookieStore : CookieJar, CookiesStorage { fun hasSignedIn(): Boolean { val url = EhUrl.HOST_E.toHttpUrl() - return contains(url, KEY_IPD_MEMBER_ID) && - contains(url, KEY_IPD_PASS_HASH) + return contains(url, KEY_IPB_MEMBER_ID) && + contains(url, KEY_IPB_PASS_HASH) } - const val KEY_IPD_MEMBER_ID = "ipb_member_id" - const val KEY_IPD_PASS_HASH = "ipb_pass_hash" + const val KEY_IPB_MEMBER_ID = "ipb_member_id" + const val KEY_IPB_PASS_HASH = "ipb_pass_hash" const val KEY_IGNEOUS = "igneous" private val sTipsCookie: Cookie = Cookie.Builder() .name(EhConfig.KEY_CONTENT_WARNING) 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 fbd157c2c..25195f568 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt +++ b/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt @@ -53,15 +53,15 @@ class AccountPreference @JvmOverloads constructor( while (i < n) { val cookie = cookies[i] when (cookie.name) { - EhCookieStore.KEY_IPD_MEMBER_ID -> ipbMemberId = cookie.value - EhCookieStore.KEY_IPD_PASS_HASH -> ipbPassHash = cookie.value + EhCookieStore.KEY_IPB_MEMBER_ID -> ipbMemberId = cookie.value + EhCookieStore.KEY_IPB_PASS_HASH -> ipbPassHash = cookie.value EhCookieStore.KEY_IGNEOUS -> igneous = cookie.value } i++ } if (ipbMemberId != null || ipbPassHash != null || igneous != null) { - message = (EhCookieStore.KEY_IPD_MEMBER_ID + ": " + ipbMemberId + "
" - + EhCookieStore.KEY_IPD_PASS_HASH + ": " + ipbPassHash + "
" + message = (EhCookieStore.KEY_IPB_MEMBER_ID + ": " + ipbMemberId + "
" + + EhCookieStore.KEY_IPB_PASS_HASH + ": " + ipbPassHash + "
" + EhCookieStore.KEY_IGNEOUS + ": " + igneous) setDialogMessage( Html.fromHtml( diff --git a/app/src/main/java/com/hippo/ehviewer/preference/SignInRequiredPreference.java b/app/src/main/java/com/hippo/ehviewer/preference/SignInRequiredPreference.java index 684887c00..9231f3d0e 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/SignInRequiredPreference.java +++ b/app/src/main/java/com/hippo/ehviewer/preference/SignInRequiredPreference.java @@ -62,10 +62,10 @@ public class SignInRequiredPreference extends Preference implements Preference.O HttpUrl e = HttpUrl.get(EhUrl.HOST_E); HttpUrl ex = HttpUrl.get(EhUrl.HOST_EX); - if (store.contains(e, EhCookieStore.KEY_IPD_MEMBER_ID) || - store.contains(e, EhCookieStore.KEY_IPD_PASS_HASH) || - store.contains(ex, EhCookieStore.KEY_IPD_MEMBER_ID) || - store.contains(ex, EhCookieStore.KEY_IPD_PASS_HASH)) { + if (store.contains(e, EhCookieStore.KEY_IPB_MEMBER_ID) || + store.contains(e, EhCookieStore.KEY_IPB_PASS_HASH) || + store.contains(ex, EhCookieStore.KEY_IPB_MEMBER_ID) || + store.contains(ex, EhCookieStore.KEY_IPB_PASS_HASH)) { return false; } else { mActivity.showTip(R.string.error_please_login_first, BaseScene.LENGTH_SHORT); 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 1c47b26c8..2f5c2eaeb 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 @@ -91,10 +91,10 @@ fun CookieSignInScene() { fun storeCookie(id: String, hash: String, igneous: String) { EhUtils.signOut() val store = EhApplication.ehCookieStore - store.addCookie(newCookie(EhCookieStore.KEY_IPD_MEMBER_ID, id, EhUrl.DOMAIN_E)) - store.addCookie(newCookie(EhCookieStore.KEY_IPD_MEMBER_ID, id, EhUrl.DOMAIN_EX)) - store.addCookie(newCookie(EhCookieStore.KEY_IPD_PASS_HASH, hash, EhUrl.DOMAIN_E)) - store.addCookie(newCookie(EhCookieStore.KEY_IPD_PASS_HASH, hash, EhUrl.DOMAIN_EX)) + 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)) + store.addCookie(newCookie(EhCookieStore.KEY_IPB_PASS_HASH, hash, EhUrl.DOMAIN_EX)) if (igneous.isBlank()) return store.addCookie(newCookie(EhCookieStore.KEY_IGNEOUS, igneous, EhUrl.DOMAIN_E)) store.addCookie(newCookie(EhCookieStore.KEY_IGNEOUS, igneous, EhUrl.DOMAIN_EX)) 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 45bc0de21..b0b4d80bd 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 @@ -89,9 +89,9 @@ fun WebviewSignInScreen() { var getId = false var getHash = false for (cookie in cookies) { - if (EhCookieStore.KEY_IPD_MEMBER_ID == cookie.name) { + if (EhCookieStore.KEY_IPB_MEMBER_ID == cookie.name) { getId = true - } else if (EhCookieStore.KEY_IPD_PASS_HASH == cookie.name) { + } else if (EhCookieStore.KEY_IPB_PASS_HASH == cookie.name) { getHash = true } addCookie(EhUrl.DOMAIN_EX, cookie)