mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-02-16 10:42:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(mqtt): enable TLS when using official mqtt server (#3088)

Browse Source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich
2025-09-14 07:31:12 -05:00
parent 0467647676
commit 4dbbcd222d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/MQTTConfigItemList.kt
View File

@@ -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 } },
)
}

2
app/src/main/res/values/strings.xml
View File

@@ -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>