From 4dbbcd222ddb8df1d8113e2a2dcbebfd3e963fdd Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Sun, 14 Sep 2025 07:31:12 -0500
Subject: [PATCH] fix(mqtt): enable TLS when using official mqtt server (#3088)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
---
 .../ui/settings/radio/components/MQTTConfigItemList.kt     | 7 +++++--
 app/src/main/res/values/strings.xml                        | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/MQTTConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/MQTTConfigItemList.kt
index 3e616d9cd..9971997c2 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/MQTTConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/MQTTConfigItemList.kt
@@ -160,10 +160,13 @@ fun MQTTConfigItemList(
         item { HorizontalDivider() }
 
         item {
+            val defaultAddress = stringResource(R.string.default_mqtt_address)
+            val isDefault = mqttInput.address.isEmpty() || mqttInput.address.contains(defaultAddress)
+            val enforceTls = isDefault && mqttInput.proxyToClientEnabled
             SwitchPreference(
                 title = stringResource(R.string.tls_enabled),
-                checked = mqttInput.tlsEnabled,
-                enabled = enabled,
+                checked = mqttInput.tlsEnabled || enforceTls,
+                enabled = enabled && !enforceTls,
                 onCheckedChange = { mqttInput = mqttInput.copy { tlsEnabled = it } },
             )
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d849a9106..3e03f5b77 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,6 +26,8 @@
     <string name="some_username" translatable="false">SKH</string>
     <string name="sample_message" translatable="false">hey I found the cache, it is over here next to the big tiger. I\'m kinda scared.</string>
 
+    <string name="default_mqtt_address" translatable="false">mqtt.meshtastic.org</string>
+
     <string name="fallback_node_name">Meshtastic %s</string>
     <string name="node_filter_placeholder">Filter</string>
     <string name="desc_node_filter_clear">clear node filter</string>