yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move route out of object

Browse Source
This commit is contained in:
tarsin committed 2023-01-22 16:27:36 +08:00
1 parent bf13bbf506
commit 0ef11b58d2
4 files changed
+8 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
-1
View File
@@ -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
app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt
+5 -7
View File
@@ -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"
app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
-3
View File
@@ -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
app/src/main/java/com/hippo/ehviewer/ui/login/WebviewSignInScreen.kt
+3 -4
View File
@@ -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
)
)
}