From 4cb2125752bd25d53393fff65c1291c8d46beb63 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Wed, 15 Jan 2025 16:28:00 -0800 Subject: [PATCH 1/3] Hide username, password and tls toggle for public server --- Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift index ca54a40e..61231745 100644 --- a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift @@ -174,7 +174,7 @@ struct MQTTConfig: View { .keyboardType(.default) } .autocorrectionDisabled() - if !proxyToClientEnabled && address != "mqtt.meshtastic.org" { + if address != "mqtt.meshtastic.org" { HStack { Label("mqtt.username", systemImage: "person.text.rectangle") TextField("mqtt.username", text: $username) From f5a9127f05dbae76f81ccc192eb9ba012bc58b92 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Wed, 15 Jan 2025 16:31:09 -0800 Subject: [PATCH 2/3] Update TLS help text --- Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift index 61231745..f616f8bf 100644 --- a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift @@ -216,7 +216,7 @@ struct MQTTConfig: View { .listRowSeparator(/*@START_MENU_TOKEN@*/.visible/*@END_MENU_TOKEN@*/) Toggle(isOn: $tlsEnabled) { Label("TLS Enabled", systemImage: "checkmark.shield.fill") - Text("Your MQTT Server must support TLS. Not available via the public mqtt server.") + Text("Your MQTT Server must support TLS.") } .toggleStyle(SwitchToggleStyle(tint: .accentColor)) } From e9464e0b1973747e452c35f3fedcd01908ce6ff3 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Wed, 15 Jan 2025 16:51:28 -0800 Subject: [PATCH 3/3] Bump version --- Meshtastic.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj index 9c1c0d6d..238ed7d6 100644 --- a/Meshtastic.xcodeproj/project.pbxproj +++ b/Meshtastic.xcodeproj/project.pbxproj @@ -1755,7 +1755,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.5.16; + MARKETING_VERSION = 2.5.17; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; @@ -1789,7 +1789,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.5.16; + MARKETING_VERSION = 2.5.17; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; @@ -1821,7 +1821,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.5.16; + MARKETING_VERSION = 2.5.17; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1854,7 +1854,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.5.16; + MARKETING_VERSION = 2.5.17; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "";