From 70d4c6043e0d84cc1027068be4cf7477b70166af Mon Sep 17 00:00:00 2001 From: Matthew Davies Date: Sat, 6 Apr 2024 16:02:25 -0700 Subject: [PATCH 1/2] Fix bug where MQTT was showing connected even if down/up was not enabled --- Meshtastic/Views/Messages/ChannelMessageList.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift index 9017951f..8688eed4 100644 --- a/Meshtastic/Views/Messages/ChannelMessageList.swift +++ b/Meshtastic/Views/Messages/ChannelMessageList.swift @@ -159,7 +159,7 @@ struct ChannelMessageList: View { name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?", // mqttProxyConnected defaults to false, so if it's not enabled it will still be false - mqttProxyConnected: bleManager.mqttProxyConnected, + mqttProxyConnected: bleManager.mqttProxyConnected && (channel.uplinkEnabled || channel.downlinkEnabled), mqttUplinkEnabled: channel.uplinkEnabled, mqttDownlinkEnabled: channel.downlinkEnabled, mqttTopic: bleManager.mqttManager.topic From f40f9345516265d7925c9c2fca6242833f79f1cb Mon Sep 17 00:00:00 2001 From: Matthew Davies Date: Sat, 6 Apr 2024 16:09:08 -0700 Subject: [PATCH 2/2] Add mqtt connected indicator & topic to connect screen --- Meshtastic/Views/Bluetooth/Connect.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Meshtastic/Views/Bluetooth/Connect.swift b/Meshtastic/Views/Bluetooth/Connect.swift index 42d23865..cbade213 100644 --- a/Meshtastic/Views/Bluetooth/Connect.swift +++ b/Meshtastic/Views/Bluetooth/Connect.swift @@ -260,7 +260,7 @@ struct Connect: View { .navigationTitle("bluetooth") .navigationBarItems(leading: MeshtasticLogo(), trailing: ZStack { - ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?") + ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?", mqttProxyConnected: bleManager.mqttProxyConnected, mqttTopic: bleManager.mqttManager.topic) }) } .sheet(isPresented: $invalidFirmwareVersion, onDismiss: didDismissSheet) {