From db1da02405b101c675de4e8110fa27b4dc1fa684 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 13 Dec 2024 10:23:19 -0800 Subject: [PATCH] Fix admin key copy paste error --- Meshtastic/Persistence/UpdateCoreData.swift | 4 ++-- Meshtastic/Views/Settings/Config/SecurityConfig.swift | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Meshtastic/Persistence/UpdateCoreData.swift b/Meshtastic/Persistence/UpdateCoreData.swift index 9feecf6d..b824f777 100644 --- a/Meshtastic/Persistence/UpdateCoreData.swift +++ b/Meshtastic/Persistence/UpdateCoreData.swift @@ -832,9 +832,9 @@ func upsertSecurityConfigPacket(config: Config.SecurityConfig, nodeNum: Int64, s if config.adminKey.count > 0 { fetchedNode[0].securityConfig?.adminKey = config.adminKey[0] if config.adminKey.count > 1 { - fetchedNode[0].securityConfig?.adminKey = config.adminKey[1] + fetchedNode[0].securityConfig?.adminKey2 = config.adminKey[1] } else if config.adminKey.count > 2 { - fetchedNode[0].securityConfig?.adminKey = config.adminKey[2] + fetchedNode[0].securityConfig?.adminKey3 = config.adminKey[2] } } fetchedNode[0].securityConfig?.isManaged = config.isManaged diff --git a/Meshtastic/Views/Settings/Config/SecurityConfig.swift b/Meshtastic/Views/Settings/Config/SecurityConfig.swift index e62251c8..6f16c8ff 100644 --- a/Meshtastic/Views/Settings/Config/SecurityConfig.swift +++ b/Meshtastic/Views/Settings/Config/SecurityConfig.swift @@ -85,7 +85,7 @@ struct SecurityConfig: View { .font(idiom == .phone ? .caption : .callout) Divider() Label("Tertiary Admin Key", systemImage: "key.viewfinder") - SecureInput("Tertiary Admin Key", text: $adminKey3, isValid: $hasValidAdminKey2) + SecureInput("Tertiary Admin Key", text: $adminKey3, isValid: $hasValidAdminKey3) .background( RoundedRectangle(cornerRadius: 10.0) .stroke(hasValidAdminKey3 ? Color.clear : Color.red, lineWidth: 2.0) @@ -198,8 +198,6 @@ struct SecurityConfig: View { .onFirstAppear { // Need to request a DeviceConfig from the remote node before allowing changes if let connectedPeripheral = bleManager.connectedPeripheral, let node { - - let connectedNode = getNodeInfo(id: connectedPeripheral.num, context: context) if let connectedNode { if node.num != connectedNode.num {