[FEAT/#1] intent flag 활용하여 task 관리

GO-SOPT-ANDROID · Apr 5, 2023 · a734309 · a734309
1 parent 54b38da
commit a734309
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/app/src/main/java/org/android/go/sopt/data/entity/User.kt b/app/src/main/java/org/android/go/sopt/data/entity/User.kt
@@ -8,7 +8,7 @@ import org.android.go.sopt.util.type.MBTI
 data class User(
     val id: String = "",
     val pwd: String = "",
-    val name: String? = null,
-    val specialty: String? = null,
+    val name: String? = "",
+    val specialty: String? = "",
     val mbti: MBTI? = null,
 ) : Parcelable
diff --git a/app/src/main/java/org/android/go/sopt/presentation/login/LoginActivity.kt b/app/src/main/java/org/android/go/sopt/presentation/login/LoginActivity.kt
@@ -56,8 +56,10 @@ class LoginActivity : BindingActivity<ActivityLoginBinding>(R.layout.activity_lo
             when (state) {
                 is Success -> {
                     showToast(getString(R.string.login_login_success_msg))
-                    startActivity(Intent(this, MainActivity::class.java))
-                    finish()
+                    Intent(this, MainActivity::class.java).apply {
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                        startActivity(this)
+                    }
                 }
                 is Failure -> showSnackbar(binding.root, getString(R.string.wrong_input_msg))
             }

diff --git a/app/src/main/java/org/android/go/sopt/presentation/login/LoginViewModel.kt b/app/src/main/java/org/android/go/sopt/presentation/login/LoginViewModel.kt
@@ -29,7 +29,7 @@ class LoginViewModel @Inject constructor(
     }
 
     private fun checkAutoLogin() {
-        if (authRepository.getAutoLogin()) _loginState.value = Success
+        if (authRepository.getAutoLogin() && authRepository.getSignedUpUser() != null) _loginState.value = Success
     }
 
     fun setSavedUser(savedUser: User) {

diff --git a/app/src/main/java/org/android/go/sopt/presentation/main/MainActivity.kt b/app/src/main/java/org/android/go/sopt/presentation/main/MainActivity.kt
@@ -26,7 +26,7 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
             with(binding) {
                 tvMainName.text = getString(R.string.main_name, user.name)
                 tvMainSpecialty.text = getString(R.string.main_specialty, user.specialty)
-                tvMainMbti.text = getString(R.string.main_mbti, user.mbti)
+                tvMainMbti.text = getString(R.string.main_mbti, user.mbti ?: "")
             }
         }
     }