From ae2a58d4e100f18e49d8755db5dc9f9b20305aa9 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sun, 12 Jan 2025 20:49:44 -0800 Subject: [PATCH] Updates to MQTT config and admin key 3 --- Meshtastic/Helpers/Mqtt/MqttClientProxyManager.swift | 2 +- Meshtastic/Persistence/UpdateCoreData.swift | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Meshtastic/Helpers/Mqtt/MqttClientProxyManager.swift b/Meshtastic/Helpers/Mqtt/MqttClientProxyManager.swift index 9c3947c0..98860495 100644 --- a/Meshtastic/Helpers/Mqtt/MqttClientProxyManager.swift +++ b/Meshtastic/Helpers/Mqtt/MqttClientProxyManager.swift @@ -26,7 +26,7 @@ class MqttClientProxyManager { var debugLog = false func connectFromConfigSettings(node: NodeInfoEntity) { let defaultServerAddress = "mqtt.meshtastic.org" - var useSsl = node.mqttConfig?.tlsEnabled == false + var useSsl = node.mqttConfig?.tlsEnabled == true var defaultServerPort = useSsl ? 8883 : 1883 var host = node.mqttConfig?.address if host == nil || host!.isEmpty { diff --git a/Meshtastic/Persistence/UpdateCoreData.swift b/Meshtastic/Persistence/UpdateCoreData.swift index edc21605..15c0d89b 100644 --- a/Meshtastic/Persistence/UpdateCoreData.swift +++ b/Meshtastic/Persistence/UpdateCoreData.swift @@ -833,7 +833,6 @@ func upsertSecurityConfigPacket(config: Config.SecurityConfig, nodeNum: Int64, s fetchedNode[0].securityConfig?.adminKey = config.adminKey[0] if config.adminKey.count > 1 { fetchedNode[0].securityConfig?.adminKey2 = config.adminKey[1] - } else if config.adminKey.count > 2 { fetchedNode[0].securityConfig?.adminKey3 = config.adminKey[2] } }