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: improve PKI message routing and resolve database migration racecondition (#4996)

Browse source
This commit is contained in:
James Rich 2026-04-04 19:37:20 -05:00 • committed by GitHub
parent d0e3b682ab
commit b3be9e2c38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 277 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/database/src/commonMain/kotlin/org/meshtastic/core/database/DatabaseManager.kt
View file

@ -125,16 +125,21 @@ open class DatabaseManager(
// Build/open Room DB off the main thread
val db = withContext(dispatchers.io) { getOrOpenDatabase(dbName) }
if (previousDbName != null && previousDbName != dbName) {
closeCachedDatabase(previousDbName)
}
// Emit the new DB BEFORE closing the old one. flatMapLatest collectors on
// currentDb will cancel their in-flight queries on the previous database once
// the new value is emitted. Closing the old pool first would race with those
// collectors, causing "Connection pool is closed" crashes.
_currentDb.value = db
_currentAddress.value = address
markLastUsed(dbName)
// Also mark the previous DB as used "just now" so LRU has an accurate, recent timestamp
previousDbName?.let { markLastUsed(it) }
// Now safe to close the previous DB — collectors have switched to the new instance.
if (previousDbName != null && previousDbName != dbName) {
closeCachedDatabase(previousDbName)
}
// Defer LRU eviction so switch is not blocked by filesystem work
managerScope.launch(dispatchers.io) { enforceCacheLimit(activeDbName = dbName) }