Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[p5]
이제 스플래시 뷰모델 로직은
디버그/릴리즈 버전 체크 && 점검시간 체크 -> 토큰 유뮤로 자동 로그인 체크 -> 앱 버전 업데이트 체크 -> 최신 버전이고 자동 로그인 가능하면 홈 아니면 로그인 화면으로 이동이겠네요!

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import com.airbnb.mvrx.MavericksViewModel
import com.airbnb.mvrx.MavericksViewModelFactory
import com.airbnb.mvrx.hilt.AssistedViewModelFactory
import com.airbnb.mvrx.hilt.hiltMavericksViewModelFactory
import com.airbnb.mvrx.withState
import com.sopt.clody.BuildConfig
import com.sopt.clody.domain.appupdate.AppUpdateChecker
import com.sopt.clody.domain.model.AppUpdateState
Expand Down Expand Up @@ -58,8 +57,9 @@ class SplashViewModel @AssistedInject constructor(
AmplitudeUtils.trackEvent(AmplitudeConstraints.ALARM)
}
if (!BuildConfig.DEBUG && checkInspectionAndHandle()) return
checkVersionAndNavigate()
attemptAutoLogin()

val isLoggedIn = attemptAutoLogin()
checkVersionAndNavigate(isLoggedIn)
}

private suspend fun checkInspectionAndHandle(): Boolean {
Expand All @@ -76,21 +76,20 @@ class SplashViewModel @AssistedInject constructor(
return false
}

private fun attemptAutoLogin() {
private fun attemptAutoLogin(): Boolean {
val isLoggedIn = tokenRepository.getAccessToken().isNotBlank() &&
tokenRepository.getRefreshToken().isNotBlank()
setState { copy(isUserLoggedIn = isLoggedIn) }
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[p3]
현재 로직 수정으로 인해 SplashContract.State.isLoggedIn 부분이 필요없어진 것 같습니다. 확인부탁드립니다!

return isLoggedIn
}

private suspend fun checkVersionAndNavigate() {
private suspend fun checkVersionAndNavigate(isLoggedIn: Boolean) {
val updateState = appUpdateChecker.getAppUpdateState(BuildConfig.VERSION_NAME)
setState { copy(updateState = updateState) }

if (updateState == AppUpdateState.Latest) {
delay(1000)
val isLoggedIn = withState(this@SplashViewModel) { it.isUserLoggedIn }

if (isLoggedIn == true) {
if (isLoggedIn) {
_sideEffects.send(SplashContract.SplashSideEffect.NavigateToHome)
} else {
_sideEffects.send(SplashContract.SplashSideEffect.NavigateToLogin)
Expand Down