meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix logging typo, update lock icon on messages to only show for real acks

Browse source
This commit is contained in:
Garth Vander Houwen 2024-09-18 18:25:20 -07:00
parent aaa6bbbfd2
commit 94708e76cb
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Meshtastic/Helpers/MeshPackets.swift
View file

@ -883,13 +883,13 @@ func textMessageAppPacket(
if fetchedUsers.first(where: { $0.num == packet.from }) != nil {
newMessage.fromUser = fetchedUsers.first(where: { $0.num == packet.from })
if !(newMessage.fromUser?.publicKey?.isEmpty ?? true) && newMessage.toUser != nil && packet.pkiEncrypted {
// We have a key and it is a PKC encrypted DM, check if it matches
/// We have a key and it is a PKC encrypted DM, check if it matches
if newMessage.fromUser?.publicKey != newMessage.publicKey {
newMessage.fromUser?.keyMatch = false
newMessage.fromUser?.newPublicKey = newMessage.publicKey
let nodeKey = String(newMessage.fromUser?.publicKey?.base64EncodedString() ?? "No Key").prefix(8)
let messageKey = String(newMessage.publicKey?.base64EncodedString() ?? "No Key").prefix(8)
Logger.data.error("🔑 Key Mismatch origninal key: \(nodeKey, privacy: .public) . . . new key: \(messageKey, privacy: .public) . . .")
Logger.data.error("🔑 Key mismatch original key: \(nodeKey, privacy: .public) . . . new key: \(messageKey, privacy: .public) . . .")
}
} else if packet.pkiEncrypted {
/// We have no key, set it if it is not empty
@ -909,9 +909,7 @@ func textMessageAppPacket(
if packet.to != Constants.maximumNodeNum && newMessage.fromUser != nil {
newMessage.fromUser?.lastMessage = Date()
}
var messageSaved = false
do {
try context.save()
Logger.data.info("💾 Saved a new message for \(newMessage.messageId)")

2
Meshtastic/Views/Messages/MessageText.swift
View file

@ -30,7 +30,7 @@ struct MessageText: View {
.background(isCurrentUser ? .accentColor : Color(.gray))
.cornerRadius(15)
.overlay {
if message.pkiEncrypted {
if message.pkiEncrypted && message.ackError == 0 && message.realACK {
VStack(alignment: .trailing) {
Spacer()
HStack {