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

Merge pull request #895 from meshtastic/admin-help

Browse source 
Admin help
This commit is contained in:
Garth Vander Houwen 2024-08-24 14:32:28 -07:00 • committed by GitHub
commit 964668534f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Localizable.xcstrings
View file

@ -16445,6 +16445,9 @@
},
"Pin B" : {
},
"PKI based node administration, requires firmware version 2.5+" : {
},
"Please connect to a radio to configure settings." : {
@ -18930,6 +18933,9 @@
},
"Security Config" : {
},
"Security Config Settings require a firmware version 2.5+" : {
},
"Select a channel" : {

7
Meshtastic/Persistence/UpdateCoreData.swift
View file

@ -384,12 +384,7 @@ func upsertPositionPacket (packet: MeshPacket, context: NSManagedObjectContext)
}
}
} else {
if (try? NodeInfo(serializedData: packet.decoded.payload)) != nil {
upsertNodeInfoPacket(packet: packet, context: context)
} else {
Logger.data.error("💥 Empty POSITION_APP Packet: \((try? packet.jsonString()) ?? "JSON Decode Failure", privacy: .public)")
}
Logger.data.error("💥 Empty POSITION_APP Packet: \((try? packet.jsonString()) ?? "JSON Decode Failure", privacy: .public)")
}
}
} catch {

6
Meshtastic/Views/Messages/ChannelMessageList.swift
View file

@ -94,7 +94,11 @@ struct ChannelMessageList: View {
Text("Waiting to be acknowledged. . .").font(
.caption2)
.foregroundColor(.orange)
} else if isDetectionSensorMessage {
} else if currentUser && !isDetectionSensorMessage {
Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
.foregroundStyle(ackErrorVal?.color ?? Color.red)
.font(.caption2)
} else {
let messageDate = message.timestamp
Text(" \(messageDate.formattedDate(format: MessageText.dateFormatString))").font(.caption2).foregroundColor(.gray)
}

2
Meshtastic/Views/Messages/UserList.swift
View file

@ -227,7 +227,7 @@ struct UserList: View {
.onChange(of: maxDistance) { _ in
searchUserList()
}
.onFirstAppear {
.onAppear {
searchUserList()
}
.safeAreaInset(edge: .bottom, alignment: .leading) {

4
Meshtastic/Views/Nodes/Helpers/Map/PositionPopover.swift
View file

@ -232,7 +232,9 @@ struct PositionPopover: View {
}
BatteryGauge(node: position.nodePosition!)
}
LoRaSignalStrengthMeter(snr: position.nodePosition?.snr ?? 0.0, rssi: position.nodePosition?.rssi ?? 0, preset: ModemPresets(rawValue: UserDefaults.modemPreset) ?? ModemPresets.longFast, compact: false)
if position.nodePosition?.hopsAway ?? 0 == 0 && !(position.nodePosition?.viaMqtt ?? false) {
LoRaSignalStrengthMeter(snr: position.nodePosition?.snr ?? 0.0, rssi: position.nodePosition?.rssi ?? 0, preset: ModemPresets(rawValue: UserDefaults.modemPreset) ?? ModemPresets.longFast, compact: false)
}
Spacer()
}
}

20
Meshtastic/Views/Nodes/Helpers/NodeListFilter.swift
View file

@ -91,18 +91,18 @@ struct NodeListFilter: View {
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
.listRowSeparator(.visible)
Toggle(isOn: $isEnvironment) {
Label {
Text("Environment")
} icon: {
Image(systemName: "cloud.sun")
.symbolRenderingMode(.multicolor)
if filterTitle == "Node Filters" {
Toggle(isOn: $isEnvironment) {
Label {
Text("Environment")
} icon: {
Image(systemName: "cloud.sun")
.symbolRenderingMode(.multicolor)
}
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
.listRowSeparator(.visible)
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
.listRowSeparator(.visible)
Toggle(isOn: $distanceFilter) {
Label {

2
Meshtastic/Views/Nodes/NodeList.swift
View file

@ -344,7 +344,7 @@ struct NodeList: View {
self.selectedNode = nil
}
}
.onFirstAppear {
.onAppear {
Task {
await searchNodeList()
}

3
Meshtastic/Views/Settings/AppSettings.swift
View file

@ -28,6 +28,9 @@ struct AppSettings: View {
Label("Administration", systemImage: "gearshape.2")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
Text("PKI based node administration, requires firmware version 2.5+")
.foregroundStyle(.secondary)
.font(.caption)
}
Section(header: Text("environment")) {
VStack(alignment: .leading) {

2
Meshtastic/Views/Settings/Channels.swift
View file

@ -146,7 +146,7 @@ struct Channels: View {
ChannelForm(channelIndex: $channelIndex, channelName: $channelName, channelKeySize: $channelKeySize, channelKey: $channelKey, channelRole: $channelRole, uplink: $uplink, downlink: $downlink, positionPrecision: $positionPrecision, preciseLocation: $preciseLocation, positionsEnabled: $positionsEnabled, hasChanges: $hasChanges, hasValidKey: $hasValidKey, supportedVersion: $supportedVersion)
.presentationDetents([.large])
.presentationDragIndicator(.visible)
.onAppear {
.onFirstAppear {
supportedVersion = bleManager.connectedVersion == "0.0.0" || self.minimumVersion.compare(bleManager.connectedVersion, options: .numeric) == .orderedAscending || minimumVersion.compare(bleManager.connectedVersion, options: .numeric) == .orderedSame
}
HStack {

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

@ -37,7 +37,8 @@ struct SecurityConfig: View {
VStack {
Form {
ConfigHeader(title: "Security", config: \.securityConfig, node: node, onAppear: setSecurityValues)
Text("Security Config Settings require a firmware version 2.5+")
.font(.title3)
Section(header: Text("Admin & Direct Message Keys")) {
VStack(alignment: .leading) {
Label("Public Key", systemImage: "key")