From 3934bdcbc6222a60d2f14956102ac12f133039cf Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Mon, 2 Sep 2024 22:23:56 -0700 Subject: [PATCH] Don't set keymatch to false if we get a pki failed error --- Meshtastic/Helpers/MeshPackets.swift | 5 ----- Meshtastic/Views/Nodes/Helpers/NodeDetail.swift | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift index f46600aa..efd80d72 100644 --- a/Meshtastic/Helpers/MeshPackets.swift +++ b/Meshtastic/Helpers/MeshPackets.swift @@ -632,11 +632,6 @@ func routingPacket (packet: MeshPacket, connectedNodeNum: Int64, context: NSMana } } fetchedMessage[0].ackError = Int32(routingMessage.errorReason.rawValue) - if routingError == RoutingError.pkiFailed { - fetchedMessage[0].toUser?.keyMatch = false - fetchedMessage[0].toUser?.newPublicKey = fetchedMessage[0].publicKey - } - if routingMessage.errorReason == Routing.Error.none { fetchedMessage[0].receivedACK = true diff --git a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift index f6e701a6..9195d068 100644 --- a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift +++ b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift @@ -55,11 +55,14 @@ struct NodeDetail: View { .font(.caption) .foregroundStyle(.red) Text("Public Key\(user.publicKey?.base64EncodedString() ?? "Empty Key")") + .font(.caption2) .monospaced() .allowsTightening(/*@START_MENU_TOKEN@*/true/*@END_MENU_TOKEN@*/) Text("New Key\(user.newPublicKey?.base64EncodedString() ?? "Empty Key")") + .font(.caption2) .monospaced() .allowsTightening(/*@START_MENU_TOKEN@*/true/*@END_MENU_TOKEN@*/) + } } icon: { Image(systemName: "key.slash.fill")