meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: migrate nodeDB to Room database (#717)

Browse source
This commit is contained in:
Andre K 2023-09-05 08:19:26 -03:00 • committed by GitHub
parent 99d7147efe
commit 83722159be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 742 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,11 +2,12 @@ package com.geeksville.mesh.model
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.asLiveData
import com.geeksville.mesh.MeshProtos
import com.geeksville.mesh.MeshUser
import com.geeksville.mesh.NodeInfo
import com.geeksville.mesh.Position
import kotlinx.coroutines.flow.MutableStateFlow
/// NodeDB lives inside the UIViewModel, but it needs a backpointer to reach the service
class NodeDB(private val ui: UIViewModel) {
@ -40,11 +41,11 @@ class NodeDB(private val ui: UIViewModel) {
),
it
)
}
}.associateBy { it.user?.id!! }
private val seedWithTestNodes = false
/// The unique ID of our node
// The unique userId of our node
private val _myId = MutableLiveData<String?>(if (seedWithTestNodes) "+16508765309" else null)
val myId: LiveData<String?> get() = _myId
@ -52,13 +53,16 @@ class NodeDB(private val ui: UIViewModel) {
_myId.value = myId
}
/// A map from nodeid to to nodeinfo
private val _nodes = MutableLiveData<Map<String, NodeInfo>>(mapOf(*(if (seedWithTestNodes) testNodes else listOf()).map { it.user!!.id to it }
.toTypedArray()))
val nodes: LiveData<Map<String, NodeInfo>> get() = _nodes
// A map from userId to NodeInfo
private val _nodes = MutableStateFlow(if (seedWithTestNodes) testNodes else mapOf())
val nodes: LiveData<Map<String, NodeInfo>> = _nodes.asLiveData()
val nodesByNum get() = nodes.value?.values?.associateBy { it.num }
fun setNodes(nodes: Map<String, NodeInfo>) {
_nodes.value = nodes
}
}
fun setNodes(list: List<NodeInfo>) {
setNodes(list.associateBy { it.user?.id!! })
}
}

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

@ -123,6 +123,9 @@ class UIViewModel @Inject constructor(
val packetResponse: StateFlow<MeshLog?> = _packetResponse
init {
radioConfigRepository.nodeInfoFlow().onEach(nodeDB::setNodes)
.launchIn(viewModelScope)
viewModelScope.launch {
meshLogRepository.getAllLogs().collect { logs ->
_meshLog.value = logs