From e89dc2194241ccd34024122899ccba582bd83fa5 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sun, 6 Oct 2024 09:07:55 -0700 Subject: [PATCH] Finish upgrading onchange events --- .../Settings/Config/Module/MQTTConfig.swift | 14 ++---- .../Config/Module/TelemetryConfig.swift | 48 +++++++------------ 2 files changed, 20 insertions(+), 42 deletions(-) diff --git a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift index 50eb5806..224fd43c 100644 --- a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift @@ -278,14 +278,10 @@ struct MQTTConfig: View { if newUsername != node?.mqttConfig?.username ?? "" { hasChanges = true } } .onChange(of: password) { newPassword in - if node != nil && node?.mqttConfig != nil { - if newPassword != node!.mqttConfig!.password { hasChanges = true } - } + if newPassword != node?.mqttConfig?.password ?? "" { hasChanges = true } } .onChange(of: root) { newRoot in - if node != nil && node?.mqttConfig != nil { - if newRoot != node!.mqttConfig!.root { hasChanges = true } - } + if newRoot != node?.mqttConfig?.root ?? "" { hasChanges = true } } .onChange(of: selectedTopic) { _, newSelectedTopic in root = newSelectedTopic @@ -320,10 +316,8 @@ struct MQTTConfig: View { .onChange(of: mapReportingEnabled) { _, newMapReportingEnabled in if newMapReportingEnabled != node?.mqttConfig?.mapReportingEnabled { hasChanges = true } } - .onChange(of: mapPublishIntervalSecs) { newMapPublishIntervalSecs in - if node != nil && node?.mqttConfig != nil { - if newMapPublishIntervalSecs != node!.mqttConfig!.mapPublishIntervalSecs { hasChanges = true } - } + .onChange(of: mapPublishIntervalSecs) { _, newMapPublishIntervalSecs in + if newMapPublishIntervalSecs != node?.mqttConfig?.mapPublishIntervalSecs ?? -1 { hasChanges = true } } .onFirstAppear { // Need to request a MqttModuleConfig from the remote node before allowing changes diff --git a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift index afef5727..4ba39834 100644 --- a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift @@ -155,45 +155,29 @@ struct TelemetryConfig: View { } } } - .onChange(of: deviceUpdateInterval) { newDeviceInterval in - if node != nil && node?.telemetryConfig != nil { - if newDeviceInterval != node!.telemetryConfig!.deviceUpdateInterval { hasChanges = true } - } + .onChange(of: deviceUpdateInterval) { _, newDeviceInterval in + if newDeviceInterval != node?.telemetryConfig?.deviceUpdateInterval ?? -1 { hasChanges = true } } - .onChange(of: environmentUpdateInterval) { newEnvInterval in - if node != nil && node?.telemetryConfig != nil { - if newEnvInterval != node!.telemetryConfig!.environmentUpdateInterval { hasChanges = true } - } + .onChange(of: environmentUpdateInterval) { _, newEnvInterval in + if newEnvInterval != node?.telemetryConfig?.environmentUpdateInterval ?? -1 { hasChanges = true } } - .onChange(of: environmentMeasurementEnabled) { newEnvEnabled in - if node != nil && node?.telemetryConfig != nil { - if newEnvEnabled != node!.telemetryConfig!.environmentMeasurementEnabled { hasChanges = true } - } + .onChange(of: environmentMeasurementEnabled) { _, newEnvEnabled in + if newEnvEnabled != node?.telemetryConfig?.environmentMeasurementEnabled { hasChanges = true } } - .onChange(of: environmentScreenEnabled) { newEnvScreenEnabled in - if node!.telemetryConfig != nil { - if newEnvScreenEnabled != node!.telemetryConfig!.environmentScreenEnabled { hasChanges = true } - } + .onChange(of: environmentScreenEnabled) { _, newEnvScreenEnabled in + if newEnvScreenEnabled != node?.telemetryConfig?.environmentScreenEnabled { hasChanges = true } } - .onChange(of: environmentDisplayFahrenheit) { newEnvDisplayF in - if node != nil && node?.telemetryConfig != nil { - if newEnvDisplayF != node!.telemetryConfig!.environmentDisplayFahrenheit { hasChanges = true } - } + .onChange(of: environmentDisplayFahrenheit) { _, newEnvDisplayF in + if newEnvDisplayF != node?.telemetryConfig?.environmentDisplayFahrenheit { hasChanges = true } } - .onChange(of: powerMeasurementEnabled) { newPowerMeasurementEnabled in - if node != nil && node?.telemetryConfig != nil { - if newPowerMeasurementEnabled != node!.telemetryConfig!.powerMeasurementEnabled { hasChanges = true } - } + .onChange(of: powerMeasurementEnabled) { _, newPowerMeasurementEnabled in + if newPowerMeasurementEnabled != node?.telemetryConfig?.powerMeasurementEnabled { hasChanges = true } } - .onChange(of: powerUpdateInterval) { newPowerUpdateInterval in - if node != nil && node?.telemetryConfig != nil { - if newPowerUpdateInterval != node!.telemetryConfig!.powerUpdateInterval { hasChanges = true } - } + .onChange(of: powerUpdateInterval) { _, newPowerUpdateInterval in + if newPowerUpdateInterval != node?.telemetryConfig?.powerUpdateInterval ?? -1 { hasChanges = true } } - .onChange(of: powerScreenEnabled) { newPowerScreenEnabled in - if node != nil && node?.telemetryConfig != nil { - if newPowerScreenEnabled != node!.telemetryConfig!.powerScreenEnabled { hasChanges = true } - } + .onChange(of: powerScreenEnabled) { _, newPowerScreenEnabled in + if newPowerScreenEnabled != node?.telemetryConfig?.powerScreenEnabled { hasChanges = true } } } }