Better filter before setting mismatched key

meshtastic · Sep 15, 2024 · 70b9a8d · 70b9a8d
1 parent 467685f
commit 70b9a8d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
@@ -886,11 +886,12 @@ 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) {
-					// We have a key, check if it matches
+				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
 					if newMessage.fromUser?.publicKey != newMessage.publicKey {
 						newMessage.fromUser?.keyMatch = false
 						newMessage.fromUser?.newPublicKey = newMessage.publicKey
+						Logger.data.error("🔑 Key Mismatch origninal key: \(newMessage.fromUser?.publicKey?.base64EncodedString() ?? "No Key") new key: \(newMessage.fromUser?.newPublicKey?.base64EncodedString() ?? "No Key") ")
 					}
 				} else {
 					/// We have no key, set it if it is not empty