fix(home): fix blinking huge error on home screen

flixclusiveorg · Sep 30, 2024 · ab437cc · ab437cc
1 parent c4459b4
commit ab437cc
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/core/ui/home/src/main/kotlin/com/flixclusive/core/ui/home/HomeScreenViewModel.kt b/core/ui/home/src/main/kotlin/com/flixclusive/core/ui/home/HomeScreenViewModel.kt
@@ -17,12 +17,9 @@ import com.flixclusive.model.provider.Catalog
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -98,22 +95,18 @@ class HomeScreenViewModel @Inject constructor(
 
     init {
         viewModelScope.launch {
-            val initializationStatus = homeItemsProviderUseCase.state.map {
-                it.status
-            }.distinctUntilChanged()
-
             connectionObserver
-                .combine(initializationStatus) { isConnected, status ->
-                    isConnected to status
-                }
-                .onEach { (isConnected, status) ->
+                .collectLatest { isConnected ->
+                    val status = homeItemsProviderUseCase.state.map {
+                        it.status
+                    }.first()
+
                     if (isConnected && status is Resource.Failure || status is Resource.Loading) {
                         initialize()
                     } else if(status is Resource.Success) {
                         onPaginateCatalogs()
                     }
                 }
-                .collect()
         }
     }