From f7b45797a8a0a3bff00a511099a26053a6741372 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 3 Feb 2023 10:15:11 -0800 Subject: [PATCH] Handle a few crashes --- Meshtastic/Views/Nodes/DeviceMetricsLog.swift | 2 +- Meshtastic/Views/Settings/Config/BluetoothConfig.swift | 2 +- .../Views/Settings/Config/Module/TelemetryConfig.swift | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift index c3ba0a1c..b5ca5b32 100644 --- a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift +++ b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift @@ -177,7 +177,7 @@ struct DeviceMetricsLog: View { isPresented: $isExporting, document: CsvDocument(emptyCsv: exportString), contentType: .commaSeparatedText, - defaultFilename: String("\(node.user!.longName ?? "Node") \(NSLocalizedString("device.metrics.log", comment: "Device Metrics Log"))"), + defaultFilename: String("\(node.user?.longName ?? "Node") \(NSLocalizedString("device.metrics.log", comment: "Device Metrics Log"))"), onCompletion: { result in if case .success = result { print("Device metrics log download succeeded.") diff --git a/Meshtastic/Views/Settings/Config/BluetoothConfig.swift b/Meshtastic/Views/Settings/Config/BluetoothConfig.swift index b11e4614..33d01896 100644 --- a/Meshtastic/Views/Settings/Config/BluetoothConfig.swift +++ b/Meshtastic/Views/Settings/Config/BluetoothConfig.swift @@ -128,7 +128,7 @@ struct BluetoothConfig: View { self.hasChanges = false // Need to request a BluetoothConfig from the remote node before allowing changes - if bleManager.connectedPeripheral != nil && node?.loRaConfig == nil { + if bleManager.connectedPeripheral != nil && node?.bluetoothConfig == nil { print("empty bluetooth config") let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context) if connectedNode.id > 0 { diff --git a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift index 88bc907d..acd96ad0 100644 --- a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift @@ -123,17 +123,17 @@ struct TelemetryConfig: View { } } .onChange(of: deviceUpdateInterval) { newDeviceInterval in - if node != nil && node!.telemetryConfig != nil { + if node != nil && node?.telemetryConfig != nil { if newDeviceInterval != node!.telemetryConfig!.deviceUpdateInterval { hasChanges = true } } } .onChange(of: environmentUpdateInterval) { newEnvInterval in - if node != nil && node!.telemetryConfig != nil { + if node != nil && node?.telemetryConfig != nil { if newEnvInterval != node!.telemetryConfig!.environmentUpdateInterval { hasChanges = true } } } .onChange(of: environmentMeasurementEnabled) { newEnvEnabled in - if node != nil && node!.telemetryConfig != nil { + if node != nil && node?.telemetryConfig != nil { if newEnvEnabled != node!.telemetryConfig!.environmentMeasurementEnabled { hasChanges = true } } } @@ -143,7 +143,7 @@ struct TelemetryConfig: View { } } .onChange(of: environmentDisplayFahrenheit) { newEnvDisplayF in - if node != nil && node!.telemetryConfig != nil { + if node != nil && node?.telemetryConfig != nil { if newEnvDisplayF != node!.telemetryConfig!.environmentDisplayFahrenheit { hasChanges = true } } }