mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-27 18:21:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(messaging): fix contact key derivation in ContactsViewModel (#4887)

Browse Source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich
2026-03-23 07:14:01 -05:00
committed by GitHub
parent 5a287f7133
commit cb89b111de
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/ui/contact/ContactsViewModel.kt
View File

@@ -139,15 +139,17 @@ class ContactsViewModel(
packetRepository.getContactsPaged().map { pagingData ->
pagingData.map { packetData: DataPacket ->
val contactKey =
"${packetData.channel}${packetData.to}" // This might be wrong, need to check how contactKey
// is derived in PagingSource
// Determine if this is my message (originated on this device)
val fromLocal =
(packetData.from == DataPacket.ID_LOCAL || (myId != null && packetData.from == myId))
val toBroadcast = packetData.to == DataPacket.ID_BROADCAST
// Reconstruct contactKey exactly as rememberDataPacket() computes it:
// For outgoing or broadcast: use the "to" field (recipient / ^all)
// For incoming DMs: use the "from" field (the other party)
val contactId = if (fromLocal || toBroadcast) packetData.to else packetData.from
val contactKey = "${packetData.channel}$contactId"
// grab usernames from NodeInfo
val userId = if (fromLocal) packetData.to else packetData.from
val user = nodeRepository.getUser(userId ?: DataPacket.ID_BROADCAST)
@@ -161,18 +163,15 @@ class ContactsViewModel(
user.long_name
}
val contactKeyComputed =
if (toBroadcast) "${packetData.channel}${DataPacket.ID_BROADCAST}" else contactKey
Contact(
contactKey = contactKeyComputed,
contactKey = contactKey,
shortName = if (toBroadcast) packetData.channel.toString() else shortName,
longName = longName,
lastMessageTime = if (packetData.time != 0L) packetData.time else null,
lastMessageText = if (fromLocal) packetData.text else "$shortName: ${packetData.text}",
unreadCount = packetRepository.getUnreadCount(contactKeyComputed),
messageCount = packetRepository.getMessageCount(contactKeyComputed),
isMuted = settings[contactKeyComputed]?.isMuted == true,
unreadCount = packetRepository.getUnreadCount(contactKey),
messageCount = packetRepository.getMessageCount(contactKey),
isMuted = settings[contactKey]?.isMuted == true,
isUnmessageable = user.is_unmessagable ?: false,
nodeColors =
if (!toBroadcast) {