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

feat: Improve node handling and add client notifications (#4130)

Browse source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich 2026-01-04 11:32:13 -06:00 • committed by GitHub
parent 2c9f410baa
commit e5f78d101c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 59 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

52
core/database/src/main/kotlin/org/meshtastic/core/database/dao/NodeInfoDao.kt
View file

@ -85,30 +85,50 @@ interface NodeInfoDao {
}
private fun handleExistingNodeUpsertValidation(existingNode: NodeEntity, incomingNode: NodeEntity): NodeEntity {
val isPlaceholder = incomingNode.user.hwModel == MeshProtos.HardwareModel.UNSET
val hasExistingUser = existingNode.user.hwModel != MeshProtos.HardwareModel.UNSET
val isDefaultName = incomingNode.user.longName.matches(Regex("^Meshtastic [0-9a-fA-F]{4}$"))
val shouldPreserve = hasExistingUser && isPlaceholder && isDefaultName
if (shouldPreserve) {
// Preserve existing name and user info, but update metadata like lastHeard, SNR, and position.
val resolvedNotes = if (incomingNode.notes.isBlank()) existingNode.notes else incomingNode.notes
return existingNode.copy(
lastHeard = incomingNode.lastHeard,
snr = incomingNode.snr,
rssi = incomingNode.rssi,
position = incomingNode.position,
hopsAway = incomingNode.hopsAway,
deviceTelemetry = incomingNode.deviceTelemetry,
environmentTelemetry = incomingNode.environmentTelemetry,
powerTelemetry = incomingNode.powerTelemetry,
paxcounter = incomingNode.paxcounter,
channel = incomingNode.channel,
viaMqtt = incomingNode.viaMqtt,
notes = resolvedNotes,
)
}
// A public key is considered matching if the incoming key equals the existing key,
// OR if the existing key is empty (allowing a new key to be set or an update to proceed).
val isPublicKeyMatchingOrExistingIsEmpty =
existingNode.user.publicKey == incomingNode.publicKey || existingNode.user.publicKey.isEmpty
val existingResolvedKey = existingNode.publicKey ?: existingNode.user.publicKey
val isPublicKeyMatchingOrExistingIsEmpty = existingResolvedKey == incomingNode.publicKey || !existingNode.hasPKC
val isPlaceholder = incomingNode.user.hwModel == MeshProtos.HardwareModel.UNSET
val resolvedNotes = if (incomingNode.notes.isBlank()) existingNode.notes else incomingNode.notes
return if (isPublicKeyMatchingOrExistingIsEmpty) {
// Keys match or existing key was empty: trust the incoming node data completely.
// This allows for legitimate updates to user info and other fields.
val resolvedNotes = if (incomingNode.notes.isBlank()) existingNode.notes else incomingNode.notes
val resolvedLongName = if (isPlaceholder) null else incomingNode.longName ?: existingNode.longName
val resolvedShortName = if (isPlaceholder) null else incomingNode.shortName ?: existingNode.shortName
incomingNode.copy(notes = resolvedNotes, longName = resolvedLongName, shortName = resolvedShortName)
incomingNode.copy(notes = resolvedNotes)
} else {
existingNode.copy(
lastHeard = incomingNode.lastHeard,
snr = incomingNode.snr,
position = incomingNode.position,
// Preserve the existing user object, but update its internal public key to EMPTY
// to reflect the conflict state.
user = existingNode.user.toBuilder().setPublicKey(ByteString.EMPTY).build(),
publicKey = ByteString.EMPTY,
notes = existingNode.notes,
// Public key mismatch: This could be a factory reset or a hardware ID collision.
// We allow the name and user info to update, but we clear the public key
// to indicate that this node is no longer "verified" against the previous key.
incomingNode.copy(
user = incomingNode.user.toBuilder().setPublicKey(NodeEntity.ERROR_BYTE_STRING).build(),
publicKey = NodeEntity.ERROR_BYTE_STRING,
notes = resolvedNotes,
)
}
}