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 725220dba..2bcfb1397 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 @@ -64,7 +64,7 @@ import java.util.Locale @OptIn(ExperimentalMaterial3Api::class) @Composable -fun CookieSignInScene(navController: NavController, postLogin: suspend () -> Unit) { +fun CookieSignInScene(navController: NavController) { val clipboardManager = LocalClipboardManager.current val focusManager = LocalFocusManager.current val snackbarHostState = remember { SnackbarHostState() } 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 ce9da6192..c0fa77bd6 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 @@ -25,21 +25,15 @@ class LoginActivity : EhActivity() { NavHost(navController = navController, startDestination = SIGN_IN_ROUTE_NAME) { composable(SIGN_IN_ROUTE_NAME) { - SignInScreen(navController) { - postLogin() - } + SignInScreen(navController) } composable(WEBVIEW_SIGN_IN_ROUTE_NAME) { - WebviewSignInScreen(navController) { - postLogin() - } + WebviewSignInScreen(navController) } composable(COOKIE_SIGN_IN_ROUTE_NAME) { - CookieSignInScene(navController) { - postLogin() - } + CookieSignInScene(navController) } composable(SELECT_SITE_ROUTE_NAME) { @@ -64,28 +58,28 @@ class LoginActivity : EhActivity() { Settings.putNeedSignIn(false) ActivityNavigator.applyPopAnimationsToPendingTransition(this) } +} - private suspend fun postLogin() { - runCatching { - EhEngine.getProfile().run { - Settings.putDisplayName(displayName) - Settings.putAvatar(avatar) - } - }.onFailure { - it.printStackTrace() +suspend fun postLogin() { + runCatching { + EhEngine.getProfile().run { + Settings.putDisplayName(displayName) + Settings.putAvatar(avatar) } + }.onFailure { + it.printStackTrace() + } + runCatching { + Settings.putGallerySite(EhUrl.SITE_EX) + EhEngine.getUConfig() + }.onFailure { + Settings.putSelectSite(false) + Settings.putGallerySite(EhUrl.SITE_E) runCatching { - Settings.putGallerySite(EhUrl.SITE_EX) EhEngine.getUConfig() }.onFailure { - Settings.putSelectSite(false) - Settings.putGallerySite(EhUrl.SITE_E) - runCatching { - EhEngine.getUConfig() - }.onFailure { - it.printStackTrace() - } + it.printStackTrace() } } } 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 32dc52ce0..9ea15e49f 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 @@ -67,7 +67,7 @@ import rikka.core.util.ContextUtils.requireActivity @OptIn(ExperimentalMaterial3Api::class) @Composable -fun SignInScreen(navController: NavController, postLogin: suspend () -> Unit) { +fun SignInScreen(navController: NavController) { val coroutineScope = rememberCoroutineScope() val focusManager = LocalFocusManager.current var isProgressIndicatorVisible by rememberSaveable { mutableStateOf(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 debdd4b4c..f19fd4ff9 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 @@ -23,7 +23,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrlOrNull @SuppressLint("SetJavaScriptEnabled") @Composable -fun WebviewSignInScreen(navController: NavController, postLogin: suspend () -> Unit) { +fun WebviewSignInScreen(navController: NavController) { val context = LocalContext.current val coroutineScope = rememberCoroutineScope() AndroidView(factory = {