From bbc6d4d40a9f5bdbf5cc67a47cfc50c512a151e2 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Thu, 15 Aug 2024 20:20:59 -0700 Subject: [PATCH] Updated help text. --- Localizable.xcstrings | 7 ++----- .../Views/Helpers/Help/DirectMessagesHelp.swift | 1 + Meshtastic/Views/Helpers/Help/LockLegend.swift | 15 ++++++++++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Localizable.xcstrings b/Localizable.xcstrings index 798611fc..514c0443 100644 --- a/Localizable.xcstrings +++ b/Localizable.xcstrings @@ -6319,7 +6319,7 @@ "Direct messages are using the new public key infrastructure to encrypt the message." : { }, - "Direct messages are using the shared key for the channel when communicating with this node." : { + "Direct messages are using the shared key for the channel." : { }, "direct.messages" : { @@ -15418,9 +15418,6 @@ } } } - }, - "Node Encryption Status" : { - }, "Node History" : { @@ -21017,7 +21014,7 @@ "The public key authorized to send admin messages to this node." : { }, - "The public key does not match the key that was used previously, delete the node and let it negotatiate keys again. Usually the other user did a factory reset, but it could indicate a security issue." : { + "The public key does not match the recorded key. You may delete the node and let it exchange keys again, but this may indicate a more serious security problem. Contact the user through another trusted channel, to determine if the key change was due to a factory reset or other intentional action." : { }, "The region where you will be using your radios." : { diff --git a/Meshtastic/Views/Helpers/Help/DirectMessagesHelp.swift b/Meshtastic/Views/Helpers/Help/DirectMessagesHelp.swift index dd57f29f..f4f8bda3 100644 --- a/Meshtastic/Views/Helpers/Help/DirectMessagesHelp.swift +++ b/Meshtastic/Views/Helpers/Help/DirectMessagesHelp.swift @@ -42,6 +42,7 @@ struct DirectMessagesHelp: View { HStack(alignment: .top) { LockLegend() AckErrors() + .padding(.trailing) } } #if targetEnvironment(macCatalyst) diff --git a/Meshtastic/Views/Helpers/Help/LockLegend.swift b/Meshtastic/Views/Helpers/Help/LockLegend.swift index b47aaf20..adfa91b5 100644 --- a/Meshtastic/Views/Helpers/Help/LockLegend.swift +++ b/Meshtastic/Views/Helpers/Help/LockLegend.swift @@ -11,10 +11,9 @@ struct LockLegend: View { var body: some View { VStack(alignment: .leading) { - Text("Node Encryption Status") - .font(.title2) Text("What does the lock mean?") - .padding(.bottom) + .font(.title2) + .padding(.bottom, 5) VStack(alignment: .leading) { HStack { Image(systemName: "lock.open.fill") @@ -22,7 +21,9 @@ struct LockLegend: View { Text("Shared Key") .fontWeight(.semibold) } - Text("Direct messages are using the shared key for the channel when communicating with this node.") + Text("Direct messages are using the shared key for the channel.") + .allowsTightening(/*@START_MENU_TOKEN@*/true/*@END_MENU_TOKEN@*/) + .font(.callout) .fixedSize(horizontal: false, vertical: true) } .padding(.bottom) @@ -34,6 +35,8 @@ struct LockLegend: View { .fontWeight(.semibold) } Text("Direct messages are using the new public key infrastructure to encrypt the message.") + .allowsTightening(/*@START_MENU_TOKEN@*/true/*@END_MENU_TOKEN@*/) + .font(.callout) .fixedSize(horizontal: false, vertical: true) } .padding(.bottom) @@ -44,7 +47,9 @@ struct LockLegend: View { Text("Public Key Mismatch") .fontWeight(.semibold) } - Text("The public key does not match the key that was used previously, delete the node and let it negotatiate keys again. Usually the other user did a factory reset, but it could indicate a security issue.") + Text("The public key does not match the recorded key. You may delete the node and let it exchange keys again, but this may indicate a more serious security problem. Contact the user through another trusted channel, to determine if the key change was due to a factory reset or other intentional action.") + .allowsTightening(/*@START_MENU_TOKEN@*/true/*@END_MENU_TOKEN@*/) + .font(.callout) .fixedSize(horizontal: false, vertical: true) } .padding(.bottom)