refactor: revert back to simpler createVersionFlow() logic

cbeyls · Feb 6, 2025 · 78e2548 · 78e2548
1 parent 8339b76
commit 78e2548
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/app/src/main/java/be/digitalia/fosdem/db/BookmarksDao.kt b/app/src/main/java/be/digitalia/fosdem/db/BookmarksDao.kt
@@ -11,13 +11,17 @@ import be.digitalia.fosdem.db.entities.Bookmark
 import be.digitalia.fosdem.db.entities.EventEntity
 import be.digitalia.fosdem.model.AlarmInfo
 import be.digitalia.fosdem.model.Event
+import be.digitalia.fosdem.utils.BackgroundWorkScope
 import kotlinx.coroutines.flow.Flow
 import java.time.Instant
 
 @Dao
 abstract class BookmarksDao(appDatabase: AppDatabase) {
-    val version: Flow<Int> =
-        appDatabase.createVersionFlow(EventEntity.TABLE_NAME, Bookmark.TABLE_NAME)
+    val version: Flow<Int> = appDatabase.createVersionFlow(
+        BackgroundWorkScope,
+        EventEntity.TABLE_NAME,
+        Bookmark.TABLE_NAME
+    )
 
     /**
      * Returns the bookmarks.

diff --git a/app/src/main/java/be/digitalia/fosdem/db/RoomDatabaseExt.kt b/app/src/main/java/be/digitalia/fosdem/db/RoomDatabaseExt.kt
@@ -2,22 +2,19 @@ package be.digitalia.fosdem.db
 
 import androidx.room.RoomDatabase
 import androidx.room.invalidationTrackerFlow
-import be.digitalia.fosdem.utils.BackgroundWorkScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 
-fun RoomDatabase.createVersionFlow(vararg tables: String): Flow<Int> {
-    return flow {
-        var version = 0
-        invalidationTrackerFlow(*tables).collect {
-            emit(version++)
+fun RoomDatabase.createVersionFlow(scope: CoroutineScope, vararg tables: String): StateFlow<Int> {
+    val versionFlow = MutableStateFlow(0)
+    scope.launch {
+        invalidationTrackerFlow(tables = tables, emitInitialState = false).collect {
+            versionFlow.update { it + 1 }
         }
-    }.stateIn(
-        scope = BackgroundWorkScope,
-        started = SharingStarted.Eagerly,
-        initialValue = null
-    ).filterNotNull()
+    }
+    return versionFlow.asStateFlow()
 }
diff --git a/app/src/main/java/be/digitalia/fosdem/db/ScheduleDao.kt b/app/src/main/java/be/digitalia/fosdem/db/ScheduleDao.kt
@@ -43,7 +43,7 @@ import java.time.Instant
 @Dao
 abstract class ScheduleDao(private val appDatabase: AppDatabase) {
     val version: Flow<Int> =
-        appDatabase.createVersionFlow(EventEntity.TABLE_NAME)
+        appDatabase.createVersionFlow(BackgroundWorkScope, EventEntity.TABLE_NAME)
     val bookmarksVersion: Flow<Int>
         get() = appDatabase.bookmarksDao.version
     val databaseVersion