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

Revert broken channel key validation

Browse source 
Remove block range test
Add notes that router role is not for mobile nodes
This commit is contained in:
Garth Vander Houwen 2024-01-28 09:36:19 -08:00
parent 1bec0dae66
commit 350ec121d7
6 changed files with 19 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Meshtastic/Extensions/UserDefaults.swift
View file

@ -9,7 +9,6 @@ import Foundation
extension UserDefaults {
enum Keys: String, CaseIterable {
case enableRangeTest
case preferredPeripheralId
case preferredPeripheralNum
case provideLocation
@ -32,13 +31,6 @@ extension UserDefaults {
func reset() {
Keys.allCases.forEach { removeObject(forKey: $0.rawValue) }
}
static var blockRangeTest: Bool {
get {
UserDefaults.standard.bool(forKey: "blockRangeTest")
} set {
UserDefaults.standard.set(newValue, forKey: "blockRangeTest")
}
}
static var preferredPeripheralId: String {
get {
UserDefaults.standard.string(forKey: "preferredPeripheralId") ?? ""

6
Meshtastic/Helpers/BLEManager.swift
View file

@ -594,7 +594,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
// Log any other unknownApp calls
if !nowKnown { MeshLogger.log("🕸️ MESH PACKET received for Unknown App UNHANDLED \((try? decodedInfo.packet.jsonString()) ?? "JSON Decode Failure")") }
case .textMessageApp, .detectionSensorApp:
textMessageAppPacket(packet: decodedInfo.packet, blockRangeTest: UserDefaults.blockRangeTest, connectedNode: (self.connectedPeripheral != nil ? connectedPeripheral.num : 0), context: context!)
textMessageAppPacket(packet: decodedInfo.packet, connectedNode: (self.connectedPeripheral != nil ? connectedPeripheral.num : 0), context: context!)
case .remoteHardwareApp:
MeshLogger.log("🕸️ MESH PACKET received for Remote Hardware App UNHANDLED \((try? decodedInfo.packet.jsonString()) ?? "JSON Decode Failure")")
case .positionApp:
@ -620,8 +620,8 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
MeshLogger.log("🕸️ MESH PACKET received for Store and Forward App - Store and Forward is disabled.")
}
case .rangeTestApp:
if wantRangeTestPackets && !UserDefaults.blockRangeTest {
textMessageAppPacket(packet: decodedInfo.packet, blockRangeTest: false, connectedNode: (self.connectedPeripheral != nil ? connectedPeripheral.num : 0), context: context!)
if wantRangeTestPackets {
textMessageAppPacket(packet: decodedInfo.packet, connectedNode: (self.connectedPeripheral != nil ? connectedPeripheral.num : 0), context: context!)
}
else {
MeshLogger.log("🕸️ MESH PACKET received for Range Test App Range testing is disabled.")

6
Meshtastic/Helpers/MeshPackets.swift
View file

@ -721,13 +721,9 @@ func telemetryPacket(packet: MeshPacket, connectedNode: Int64, context: NSManage
}
}
func textMessageAppPacket(packet: MeshPacket, blockRangeTest: Bool, connectedNode: Int64, context: NSManagedObjectContext) {
func textMessageAppPacket(packet: MeshPacket, connectedNode: Int64, context: NSManagedObjectContext) {
if let messageText = String(bytes: packet.decoded.payload, encoding: .utf8) {
if blockRangeTest && messageText.starts(with: "seq ") {
return
}
MeshLogger.log("💬 \("mesh.log.textmessage.received".localized)")

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

@ -11,7 +11,6 @@ struct AppSettings: View {
@State var totalDownloadedTileSize = ""
@StateObject var locationHelper = LocationHelper()
@State var provideLocation: Bool = UserDefaults.provideLocation
@State var blockRangeTest: Bool = UserDefaults.blockRangeTest
@State var useLegacyMap: Bool = UserDefaults.mapUseLegacy
@State var provideLocationInterval: Int = UserDefaults.provideLocationInterval
@State private var isPresentingCoreDataResetConfirm = false
@ -20,12 +19,6 @@ struct AppSettings: View {
VStack {
Form {
Section(header: Text("options")) {
Toggle(isOn: $blockRangeTest) {
Label("range.test.blocked", systemImage: "x.circle")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
Toggle(isOn: $useLegacyMap) {
Label("map.use.legacy", systemImage: "map")
}
@ -151,9 +144,6 @@ struct AppSettings: View {
self.bleManager.context = context
}
}
.onChange(of: blockRangeTest) { newBlockRangeTest in
UserDefaults.blockRangeTest = newBlockRangeTest
}
.onChange(of: provideLocation) { newProvideLocation in
UserDefaults.provideLocation = newProvideLocation
if bleManager.connectedPeripheral != nil {

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

@ -1,6 +1,6 @@
//
// ShareChannel.swift
// MeshtasticApple
// Channels.swift
// Meshtastic Apple
//
// Copyright(c) Garth Vander Houwen 4/8/22.
//
@ -25,7 +25,6 @@ struct Channels: View {
var node: NodeInfoEntity?
@State var hasChanges = false
@State var hasValidKey = false
@State private var isPresentingEditView = false
@State private var isPresentingSaveConfirm: Bool = false
@State private var channelIndex: Int32 = 0
@ -168,34 +167,16 @@ struct Channels: View {
HStack(alignment: .top) {
Text("Key")
Spacer()
TextField(
"Key",
text: $channelKey
)
.padding(4)
.disableAutocorrection(true)
.keyboardType(.alphabet)
.foregroundColor(Color.gray)
.textSelection(.enabled)
.background(
RoundedRectangle(cornerRadius: 25.0)
.stroke(
hasValidKey ?
Color.green :
Color.red
, lineWidth: 2.0)
)
.onChange(of: channelKey, perform: { _ in
let tempKey = Data(base64Encoded: channelKey) ?? Data()
if tempKey.count == channelKeySize || channelKeySize == -1{
hasValidKey = true
}
else {
hasValidKey = false
}
hasChanges = true
})
.disabled(channelKeySize <= 0)
Text(channelKey)
.foregroundColor(Color.gray)
.textSelection(.enabled)
// TextField(
// "",
// text: $channelKey,
// axis: .vertical
// )
// .foregroundColor(Color.gray)
// .disabled(true)
}
Picker("Channel Role", selection: $channelRole) {
if channelRole == 1 {
@ -275,7 +256,7 @@ struct Channels: View {
} label: {
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || !hasChanges || !hasValidKey)
.disabled(bleManager.connectedPeripheral == nil || !hasChanges)
.buttonStyle(.bordered)
.buttonBorderShape(.capsule)
.controlSize(.large)