Fix first server add crash (#88)

Closes #87
siper · Jun 2, 2024 · 7903b25 · 7903b25
1 parent 17fbdca
commit 7903b25
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/app/src/main/java/ru/stersh/youamp/main/data/ServerExistRepositoryImpl.kt b/app/src/main/java/ru/stersh/youamp/main/data/ServerExistRepositoryImpl.kt
@@ -1,11 +1,16 @@
 package ru.stersh.youamp.main.data
 
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 import ru.stersh.youamp.core.room.server.SubsonicServerDao
 import ru.stersh.youamp.main.domain.ServerExistRepository
 
 internal class ServerExistRepositoryImpl(private val serverDao: SubsonicServerDao) :
     ServerExistRepository {
-    override suspend fun hasServer(): Boolean {
-        return serverDao.getCount() > 0
+
+    override suspend fun hasServer(): Flow<Boolean> {
+        return serverDao
+            .flowActive()
+            .map { it != null }
     }
 }
diff --git a/app/src/main/java/ru/stersh/youamp/main/domain/ServerExistRepository.kt b/app/src/main/java/ru/stersh/youamp/main/domain/ServerExistRepository.kt
@@ -1,5 +1,7 @@
 package ru.stersh.youamp.main.domain
 
+import kotlinx.coroutines.flow.Flow
+
 internal interface ServerExistRepository {
-    suspend fun hasServer(): Boolean
+    suspend fun hasServer(): Flow<Boolean>
 }
diff --git a/app/src/main/java/ru/stersh/youamp/main/ui/MainActivity.kt b/app/src/main/java/ru/stersh/youamp/main/ui/MainActivity.kt
@@ -71,7 +71,7 @@ class MainActivity : ComponentActivity() {
                     MainScreen.AddServer -> {
                         ServerScreen(
                             onBackClick = { rootNavController.popBackStack() },
-                            onCloseScreen = { rootNavController.navigate(Main) }
+                            onCloseScreen = {}
                         )
                     }
 

diff --git a/app/src/main/java/ru/stersh/youamp/main/ui/MainViewModel.kt b/app/src/main/java/ru/stersh/youamp/main/ui/MainViewModel.kt
@@ -5,7 +5,6 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.launch
 import ru.stersh.youamp.main.domain.AvatarUrlRepository
 import ru.stersh.youamp.main.domain.ServerExistRepository
@@ -22,7 +21,7 @@ internal class MainViewModel(
     init {
         viewModelScope.launch {
             combine(
-                flowOf(serverExistRepository.hasServer()),
+                serverExistRepository.hasServer(),
                 avatarUrlRepository.getAvatarUrl()
             ) { hasServer, avatarUrl ->
                 return@combine StateUi(