From 058e5e24526cdd601115ea1ac8acd82404136af8 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Tue, 29 Aug 2023 09:54:08 -0700 Subject: [PATCH] Only set lastMessage for users on DM's --- Meshtastic/Helpers/MeshPackets.swift | 7 +++---- Meshtastic/Views/Messages/Contacts.swift | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift index 642c9ed1..15c011f1 100644 --- a/Meshtastic/Helpers/MeshPackets.swift +++ b/Meshtastic/Helpers/MeshPackets.swift @@ -746,10 +746,9 @@ func textMessageAppPacket(packet: MeshPacket, connectedNode: Int64, context: NSM } newMessage.messagePayload = messageText newMessage.messagePayloadMarkdown = generateMessageMarkdown(message: messageText) - newMessage.fromUser?.lastMessage = Date() - - newMessage.fromUser?.objectWillChange.send() - newMessage.toUser?.objectWillChange.send() + if packet.to != 4294967295 { + newMessage.fromUser?.lastMessage = Date() + } var messageSaved = false diff --git a/Meshtastic/Views/Messages/Contacts.swift b/Meshtastic/Views/Messages/Contacts.swift index 6de47558..35d327b4 100644 --- a/Meshtastic/Views/Messages/Contacts.swift +++ b/Meshtastic/Views/Messages/Contacts.swift @@ -14,7 +14,7 @@ struct Contacts: View { @EnvironmentObject var bleManager: BLEManager @FetchRequest( - sortDescriptors: [NSSortDescriptor(key: "lastMessage", ascending: false)], + sortDescriptors: [NSSortDescriptor(key: "lastMessage", ascending: false), NSSortDescriptor(key: "longName", ascending: true)], animation: .default) private var users: FetchedResults