Skip to content

Commit

Permalink
fix logging typo, update lock icon on messages to only show for real …
Browse files Browse the repository at this point in the history
…acks
  • Loading branch information
garthvh committed Sep 19, 2024
1 parent aaa6bbb commit 94708e7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions Meshtastic/Helpers/MeshPackets.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)")
Expand Down
2 changes: 1 addition & 1 deletion Meshtastic/Views/Messages/MessageText.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 94708e7

Please sign in to comment.