#68 [FIX] : fix fcm logic

Team-Wable · Sep 5, 2024 · f762007 · f762007
1 parent 4f232d1
commit f762007
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/feature/home/src/main/java/com/teamwable/home/HomeFragment.kt b/feature/home/src/main/java/com/teamwable/home/HomeFragment.kt
@@ -62,7 +62,7 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>(FragmentHomeBinding::i
                     is HomeUiState.Loading -> findNavController().navigate(HomeFragmentDirections.actionHomeToLoading())
                     is HomeUiState.Error -> (activity as Navigation).navigateToErrorFragment()
                     is HomeUiState.Success -> Unit
-                    is HomeUiState.AddPushAlarmPermission -> initPushAlarmPermissionAlert()
+                    is HomeUiState.AddPushAlarmPermission -> if (uiState.isAllowed == null) initPushAlarmPermissionAlert()
                 }
             }
         }
@@ -72,7 +72,7 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>(FragmentHomeBinding::i
                 when (sideEffect) {
                     is HomeSideEffect.ShowSnackBar -> Snackbar.make(binding.root, sideEffect.type).show()
                     is HomeSideEffect.DismissBottomSheet -> findNavController().popBackStack()
-                    is HomeSideEffect.SaveIsPushAllowed -> viewModel.saveIsPushAlarmAllowed(sideEffect.isAllowed)
+                    else -> Unit
                 }
             }
         }

diff --git a/feature/home/src/main/java/com/teamwable/home/HomeViewModel.kt b/feature/home/src/main/java/com/teamwable/home/HomeViewModel.kt
@@ -49,8 +49,8 @@ class HomeViewModel @Inject constructor(
     private var authId = -1L
 
     init {
-        fetchIsPushAlarmAllowed()
         fetchAuthId()
+        fetchIsPushAlarmAllowed()
     }
 
     private fun fetchAuthId() {
@@ -149,7 +149,7 @@ class HomeViewModel @Inject constructor(
         }
     }
 
-    fun fetchIsPushAlarmAllowed() {
+    private fun fetchIsPushAlarmAllowed() {
         viewModelScope.launch {
             userInfoRepository.getIsPushAlarmAllowed().collectLatest { _uiState.value = HomeUiState.AddPushAlarmPermission(it) }
         }
@@ -163,7 +163,7 @@ sealed interface HomeUiState {
 
     data class Error(val errorMessage: String) : HomeUiState
 
-    data class AddPushAlarmPermission(val isAllowed: Boolean) : HomeUiState
+    data class AddPushAlarmPermission(val isAllowed: Boolean?) : HomeUiState
 }
 
 sealed interface HomeSideEffect {