Skip to content

[Refactor] IntroActivity의 Race Condition 구조 리팩토링 #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[Refactor] IntroActivity의 Race Condition 구조 리팩토링 #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f011976
feat: IntroActivity에서 observeNetworkError 없이 UiState로 네트워크 통신 오류를 해결하…
PeraSite Nov 16, 2025
7f04996
docs: HealthCheckUseCase 주석 추가
PeraSite Nov 16, 2025
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
4 changes: 4 additions & 0 deletions app/src/main/java/com/eatssu/android/domain/usecase/health/HealthCheckUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ package com.eatssu.android.domain.usecase.health
import com.eatssu.android.domain.repository.HealthCheckRepository
import javax.inject.Inject

/**
* 서버와 정상적으로 통신할 수 있는지 확인합니다.
* 실제 서버의 상태(healthy)를 체크하는 목적이 아니라, 네트워크 연결이 가능한지 확인하는 용도입니다.
*/
class HealthCheckUseCase @Inject constructor(
private val healthCheckRepository: HealthCheckRepository
) {
Expand Down
17 changes: 12 additions & 5 deletions app/src/main/java/com/eatssu/android/presentation/intro/IntroActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import com.eatssu.android.databinding.ActivityIntroBinding
import com.eatssu.android.presentation.MainActivity
import com.eatssu.android.presentation.UiEvent
import com.eatssu.android.presentation.UiState
import com.eatssu.android.presentation.error.ServerErrorActivity
import com.eatssu.android.presentation.login.LoginActivity
import com.eatssu.android.presentation.util.observeNetworkError
import com.eatssu.android.presentation.util.showToast
import com.eatssu.android.presentation.util.startActivity
import com.eatssu.common.EventLogger
Expand Down Expand Up @@ -42,8 +42,17 @@ class IntroActivity : AppCompatActivity() {
introViewModel.uiState.collectLatest { state ->
when (state) {
is UiState.Success -> {
startActivity<MainActivity>()
finish()
when (state.data) {
IntroState.ValidToken -> {
startActivity<MainActivity>()
finish()
}

IntroState.ServerError -> {
startActivity<ServerErrorActivity>()
finish()
}
}
}
Comment on lines 44 to 56
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Nov 16, 2025

Choose a reason for hiding this comment

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

medium

UiState.Success 상태를 처리하는 블록 내에서 finish() 호출이 중복되고 있습니다. finish()를 when 표현식 밖으로 빼내어 코드를 더 간결하게 만들 수 있습니다.

                    is UiState.Success -> {
                        when (state.data) {
                            IntroState.ValidToken -> startActivity<MainActivity>()
                            IntroState.ServerError -> startActivity<ServerErrorActivity>()
                        }
                        finish()
                    }


is UiState.Error -> {
Expand All @@ -68,8 +77,6 @@ class IntroActivity : AppCompatActivity() {
}
}
}

observeNetworkError()
}

private fun log() {
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/com/eatssu/android/presentation/intro/IntroViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class IntroViewModel @Inject constructor(

// 서버와 통신 가능한지 먼저 확인
if (!healthCheckUseCase()) {
// 아무 State 처리 없이 Return해도 NetworkErrorEventBus로 인해 오류 페이지로 이동
_uiState.value = UiState.Success(IntroState.ServerError)
return@launch
}

Expand All @@ -64,6 +64,7 @@ class IntroViewModel @Inject constructor(
}
}

sealed class IntroState {
object ValidToken : IntroState()
sealed interface IntroState {
data object ValidToken : IntroState
data object ServerError : IntroState
}