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 a0d9d5a33..727624bd6 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 @@ -53,7 +53,6 @@ import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhEngine import com.hippo.ehviewer.client.EhUrl import com.hippo.ehviewer.client.EhUtils -import com.hippo.ehviewer.ui.login.LoginActivity.Companion.SELECT_SITE_ROUTE_NAME import com.hippo.util.ExceptionUtils import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.lang.withUIContext diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt index 71e09c08f..dcb524bf6 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt @@ -43,11 +43,9 @@ class LoginActivity : EhActivity() { super.finish() ActivityNavigator.applyPopAnimationsToPendingTransition(this) } - - companion object { - const val SIGN_IN_ROUTE_NAME = "SignIn" - const val WEBVIEW_SIGN_IN_ROUTE_NAME = "WebViewSignIn" - const val COOKIE_SIGN_IN_ROUTE_NAME = "CookieSignIn" - const val SELECT_SITE_ROUTE_NAME = "SelectSite" - } } + +const val SIGN_IN_ROUTE_NAME = "SignIn" +const val WEBVIEW_SIGN_IN_ROUTE_NAME = "WebViewSignIn" +const val COOKIE_SIGN_IN_ROUTE_NAME = "CookieSignIn" +const val SELECT_SITE_ROUTE_NAME = "SelectSite" diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt index 88ff4157f..84de0b24e 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt @@ -57,9 +57,6 @@ import com.hippo.ehviewer.UrlOpener import com.hippo.ehviewer.client.EhEngine import com.hippo.ehviewer.client.EhUrl import com.hippo.ehviewer.client.EhUtils -import com.hippo.ehviewer.ui.login.LoginActivity.Companion.COOKIE_SIGN_IN_ROUTE_NAME -import com.hippo.ehviewer.ui.login.LoginActivity.Companion.SELECT_SITE_ROUTE_NAME -import com.hippo.ehviewer.ui.login.LoginActivity.Companion.WEBVIEW_SIGN_IN_ROUTE_NAME import com.hippo.util.ExceptionUtils import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.lang.withUIContext 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 6ea4b9f6f..07802e848 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 @@ -14,7 +14,6 @@ import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhUrl import com.hippo.ehviewer.client.EhUtils -import com.hippo.ehviewer.ui.login.LoginActivity.Companion.SELECT_SITE_ROUTE_NAME import com.hippo.ehviewer.widget.DialogWebChromeClient import okhttp3.Cookie import okhttp3.HttpUrl @@ -69,9 +68,9 @@ fun WebviewSignInScreen(navController: NavController) { EhCookieStore.newCookie( cookie, domain, - true, - true, - true + forcePersistent = true, + forceLongLive = true, + forceNotHostOnly = true ) ) }