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: reaction display regression (#4141)

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

2
app/src/main/java/com/geeksville/mesh/service/MeshActionHandler.kt
View file

@ -130,7 +130,7 @@ constructor(
val reaction =
ReactionEntity(
replyId = action.replyId,
userId = DataPacket.ID_LOCAL,
userId = nodeManager.getMyId(),
emoji = action.emoji,
timestamp = System.currentTimeMillis(),
snr = 0f,

9
app/src/main/java/com/geeksville/mesh/service/MeshDataHandler.kt
View file

@ -494,8 +494,13 @@ constructor(
}
}
private fun getSenderName(packet: DataPacket): String =
nodeManager.nodeDBbyID[packet.from]?.user?.longName ?: getString(Res.string.unknown_username)
private fun getSenderName(packet: DataPacket): String {
if (packet.from == DataPacket.ID_LOCAL) {
val myId = nodeManager.getMyId()
return nodeManager.nodeDBbyID[myId]?.user?.longName ?: getString(Res.string.unknown_username)
}
return nodeManager.nodeDBbyID[packet.from]?.user?.longName ?: getString(Res.string.unknown_username)
}
private suspend fun updateNotification(contactKey: String, dataPacket: DataPacket) {
when (dataPacket.dataType) {