diff --git a/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt index d615d26d..86db4ca2 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt @@ -77,20 +77,7 @@ class LoginActivity : BaseActivity(ActivityLoginBinding::i identityToken = identityToken, nonce = lineLoginNonce ) { - finishAffinity() - val nextIntent = Intent(applicationContext, MainActivity::class.java) - val extras = intent.getBundleExtra(Constants.EXTRA_DATA) - ?: if (intent.extras != null) { - intent.extras - } else { - null - } - if (extras != null) { - nextIntent.putExtra(Constants.EXTRA_DATA, extras) - } - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) - intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP) - startActivity(nextIntent) + navigateToMain() } } @@ -181,20 +168,7 @@ class LoginActivity : BaseActivity(ActivityLoginBinding::i // Create Google ID Token val googleIdTokenCredential = GoogleIdTokenCredential.createFrom(credential.data) viewModel.googleLogin(idToken = googleIdTokenCredential.idToken) { - finishAffinity() - val nextIntent = Intent(applicationContext, MainActivity::class.java) - val extras = intent.getBundleExtra(Constants.EXTRA_DATA) - ?: if (intent.extras != null) { - intent.extras - } else { - null - } - if (extras != null) { - nextIntent.putExtra(Constants.EXTRA_DATA, extras) - } - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) - intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP) - startActivity(nextIntent) + navigateToMain() } } else { showToast(getString(R.string.login_failed)) @@ -205,20 +179,7 @@ class LoginActivity : BaseActivity(ActivityLoginBinding::i private fun login() { viewModel.login { it?.let { Toast.makeText(applicationContext, it, Toast.LENGTH_LONG).show() } - finishAffinity() - val nextIntent = Intent(applicationContext, MainActivity::class.java) - val extras = intent.getBundleExtra(Constants.EXTRA_DATA) - ?: if (intent.extras != null) { - intent.extras - } else { - null - } - if (extras != null) { - nextIntent.putExtra(Constants.EXTRA_DATA, extras) - } - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) - intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP) - startActivity(nextIntent) + navigateToMain() } } @@ -306,20 +267,7 @@ class LoginActivity : BaseActivity(ActivityLoginBinding::i private fun handleKakaoLogin(token: OAuthToken) { viewModel.kakaoLogin(accessToken = token.accessToken) { - finishAffinity() - val nextIntent = Intent(applicationContext, MainActivity::class.java) - val extras = intent.getBundleExtra(Constants.EXTRA_DATA) - ?: if (intent.extras != null) { - intent.extras - } else { - null - } - if (extras != null) { - nextIntent.putExtra(Constants.EXTRA_DATA, extras) - } - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) - intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP) - startActivity(nextIntent) + navigateToMain() } } @@ -352,4 +300,21 @@ class LoginActivity : BaseActivity(ActivityLoginBinding::i } startActivity(nextIntent) } + + private fun navigateToMain() { + finishAffinity() + val nextIntent = Intent(applicationContext, MainActivity::class.java) + val extras = intent.getBundleExtra(Constants.EXTRA_DATA) + ?: if (intent.extras != null) { + intent.extras + } else { + null + } + if (extras != null) { + nextIntent.putExtra(Constants.EXTRA_DATA, extras) + } + nextIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) + nextIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP) + startActivity(nextIntent) + } }