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

fix: loadCachedDb() before backfill to ensure in-mem nodedb isn't stale, show filtered count in nodelist (#3827)

Browse source
This commit is contained in:
Mac DeCourcy 2025-11-26 15:44:35 -08:00 • committed by GitHub
parent 4cecc578d8
commit 500ae49b2c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View file

@ -410,7 +410,7 @@ class MeshService : Service() {
}
.launchIn(serviceScope)
loadSettings() // Load our last known node DB
loadCachedNodeDB() // Load our last known node DB
// the rest of our init will happen once we are in radioConnection.onServiceConnected
}
@ -482,7 +482,7 @@ class MeshService : Service() {
// BEGINNING OF MODEL - FIXME, move elsewhere
//
private fun loadSettings() = serviceScope.handledLaunch {
private fun loadCachedNodeDB() = serviceScope.handledLaunch {
myNodeInfo = nodeRepository.myNodeInfo.value
nodeDBbyNodeNum.putAll(nodeRepository.getNodeDBbyNum().first())
// Note: we do not haveNodeDB = true because that means we've got a valid db from a real
@ -2104,7 +2104,9 @@ class MeshService : Service() {
} else {
newNodes.forEach(::installNodeInfo)
newNodes.clear()
serviceScope.handledLaunch { nodeRepository.installConfig(myNodeInfo!!, nodeDBbyNodeNum.values.toList()) }
// Individual nodes are already upserted to DB via updateNodeInfo->nodeRepository.upsert
// Only call installConfig to persist myNodeInfo, not to overwrite all nodes
serviceScope.handledLaunch { myNodeInfo?.let { nodeRepository.installConfig(it, emptyList()) } }
haveNodeDB = true
flushEarlyReceivedPackets("node_info_complete")
sendAnalytics()
@ -2310,6 +2312,8 @@ class MeshService : Service() {
historyLog { dbSummary }
// Do not clear packet DB here; messages are per-device and should persist
clearNotifications()
// Reload nodes from the newly switched database
loadCachedNodeDB()
}
} else {
Timber.d("SetDeviceAddress: Device address is unchanged, ignoring.")