From 940ebab3adc0cdaaf8e14daca177941ff2ae1292 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Wed, 16 Jul 2025 15:15:33 -0700 Subject: [PATCH] get canned messages after the module is saved in all cases --- Meshtastic/Helpers/BLEManager.swift | 5 +---- Meshtastic/Views/Helpers/ConnectedDevice.swift | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index cc290f39..9d3fdc33 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -818,10 +818,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate nowKnown = true moduleConfig(config: decodedInfo.moduleConfig, context: context, nodeNum: Int64(truncatingIfNeeded: cp.num), nodeLongName: cp.longName) if decodedInfo.moduleConfig.payloadVariant == ModuleConfig.OneOf_PayloadVariant.cannedMessage(decodedInfo.moduleConfig.cannedMessage) { - if decodedInfo.moduleConfig.cannedMessage.enabled { - _ = self.getCannedMessageModuleMessages(destNum: cp.num, wantResponse: true) - - } + _ = self.getCannedMessageModuleMessages(destNum: cp.num, wantResponse: true) } if decodedInfo.config.payloadVariant == Config.OneOf_PayloadVariant.device(decodedInfo.config.device) { var dc = decodedInfo.config.device diff --git a/Meshtastic/Views/Helpers/ConnectedDevice.swift b/Meshtastic/Views/Helpers/ConnectedDevice.swift index e0dc8a02..a42d3877 100644 --- a/Meshtastic/Views/Helpers/ConnectedDevice.swift +++ b/Meshtastic/Views/Helpers/ConnectedDevice.swift @@ -54,13 +54,13 @@ struct ConnectedDevice: View { } else { // Create a container for Bluetooth off state HStack { - Text("bluetooth.off".localized) + Text("Bluetooth is off".localized) .font(.subheadline) .foregroundColor(.red) .accessibilityHidden(true) } .accessibilityElement(children: .ignore) - .accessibilityLabel("bluetooth.off".localized) + .accessibilityLabel("Bluetooth is off".localized) } } }