meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix admin key copy paste error

Browse source
This commit is contained in:
Garth Vander Houwen 2024-12-13 10:23:19 -08:00
parent e4b664c0bd
commit db1da02405
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Meshtastic/Persistence/UpdateCoreData.swift
View file

@ -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

4
Meshtastic/Views/Settings/Config/SecurityConfig.swift
View file

@ -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 {