refactor: ensure node database flows on IO thread

app/src/main/java/com/geeksville/mesh/model/NodeDB.kt

@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2024 Meshtastic LLC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.geeksville.mesh.model
-
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.coroutineScope
-import com.geeksville.mesh.DataPacket
-import com.geeksville.mesh.MeshProtos
-import com.geeksville.mesh.database.dao.NodeInfoDao
-import com.geeksville.mesh.database.entity.MyNodeEntity
-import com.geeksville.mesh.database.entity.NodeEntity
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.withContext
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class NodeDB @Inject constructor(
-    processLifecycle: Lifecycle,
-    private val nodeInfoDao: NodeInfoDao,
-) {
-    // hardware info about our local device (can be null)
-    private val _myNodeInfo = MutableStateFlow<MyNodeEntity?>(null)
-    val myNodeInfo: StateFlow<MyNodeEntity?> get() = _myNodeInfo
-
-    // our node info
-    private val _ourNodeInfo = MutableStateFlow<NodeEntity?>(null)
-    val ourNodeInfo: StateFlow<NodeEntity?> get() = _ourNodeInfo
-
-    // The unique userId of our node
-    private val _myId = MutableStateFlow<String?>(null)
-    val myId: StateFlow<String?> get() = _myId
-
-    // A map from nodeNum to NodeEntity
-    private val _nodeDBbyNum = MutableStateFlow<Map<Int, NodeEntity>>(mapOf())
-    val nodeDBbyNum: StateFlow<Map<Int, NodeEntity>> get() = _nodeDBbyNum
-
-    fun getUser(nodeNum: Int): MeshProtos.User = getUser(DataPacket.nodeNumToDefaultId(nodeNum))
-
-    fun getUser(userId: String): MeshProtos.User =
-        nodeDBbyNum.value.values.find { it.user.id == userId }?.user
-            ?: MeshProtos.User.newBuilder()
-                .setId(userId)
-                .setLongName("Meshtastic ${userId.takeLast(n = 4)}")
-                .setShortName(userId.takeLast(n = 4))
-                .setHwModel(MeshProtos.HardwareModel.UNSET)
-                .build()
-
-    init {
-        nodeInfoDao.getMyNodeInfo().onEach { _myNodeInfo.value = it }
-            .launchIn(processLifecycle.coroutineScope)
-
-        nodeInfoDao.nodeDBbyNum().onEach {
-            _nodeDBbyNum.value = it
-            val ourNodeInfo = it.values.firstOrNull()
-            _ourNodeInfo.value = ourNodeInfo
-            _myId.value = ourNodeInfo?.user?.id
-        }.launchIn(processLifecycle.coroutineScope)
-    }
-
-    fun getNodes(
-        sort: NodeSortOption = NodeSortOption.LAST_HEARD,
-        filter: String = "",
-        includeUnknown: Boolean = true,
-    ) = nodeInfoDao.getNodes(
-        sort = sort.sqlValue,
-        filter = filter,
-        includeUnknown = includeUnknown,
-    )
-
-    suspend fun upsert(node: NodeEntity) = withContext(Dispatchers.IO) {
-        nodeInfoDao.upsert(node)
-    }
-
-    suspend fun installNodeDB(mi: MyNodeEntity, nodes: List<NodeEntity>) = withContext(Dispatchers.IO) {
-        nodeInfoDao.clearMyNodeInfo()
-        nodeInfoDao.setMyNodeInfo(mi) // set MyNodeEntity first
-        nodeInfoDao.clearNodeInfo()
-        nodeInfoDao.putAll(nodes)
-    }
-
-    suspend fun deleteNode(num: Int) = withContext(Dispatchers.IO) {
-        nodeInfoDao.deleteNode(num)
-    }
-}

app/src/main/java/com/geeksville/mesh/model/UIState.kt

@@ -48,6 +48,7 @@ import com.geeksville.mesh.channelSettings
 import com.geeksville.mesh.config
 import com.geeksville.mesh.copy
 import com.geeksville.mesh.database.MeshLogRepository
+import com.geeksville.mesh.database.NodeRepository
 import com.geeksville.mesh.database.PacketRepository
 import com.geeksville.mesh.database.QuickChatActionRepository
 import com.geeksville.mesh.database.entity.MyNodeEntity
@@ -165,7 +166,7 @@ data class Contact(
 @HiltViewModel
 class UIViewModel @Inject constructor(
     private val app: Application,
-    private val nodeDB: NodeDB,
+    private val nodeDB: NodeRepository,
     private val radioConfigRepository: RadioConfigRepository,
     private val radioInterfaceService: RadioInterfaceService,
     private val meshLogRepository: MeshLogRepository,