From cf0836feefc787b961c0da73d46dfb7c3dc0a221 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Mon, 28 Apr 2025 19:59:32 -0700 Subject: [PATCH] Add map reporting opt in to user defaults --- Meshtastic/Extensions/UserDefaults.swift | 4 ++++ Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Meshtastic/Extensions/UserDefaults.swift b/Meshtastic/Extensions/UserDefaults.swift index ac13f24b..e1ca67f9 100644 --- a/Meshtastic/Extensions/UserDefaults.swift +++ b/Meshtastic/Extensions/UserDefaults.swift @@ -72,6 +72,7 @@ extension UserDefaults { case firmwareVersion case environmentEnableWeatherKit case enableAdministration + case mapReportingOptIn case testIntEnum } @@ -148,6 +149,9 @@ extension UserDefaults { @UserDefault(.enableAdministration, defaultValue: false) static var enableAdministration: Bool + @UserDefault(.mapReportingOptIn, defaultValue: false) + static var mapReportingOptIn: Bool + @UserDefault(.testIntEnum, defaultValue: .one) static var testIntEnum: TestIntEnum } diff --git a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift index f9f9e499..61c2292b 100644 --- a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift @@ -30,8 +30,9 @@ struct MQTTConfig: View { @State var mqttConnected: Bool = false @State var defaultTopic = "msh/US" @State var nearbyTopics = [String]() - @State var mapReportingOptIn = false @State var mapReportingEnabled = false + @State var mapReportingOptIn = false + //@AppStorage("mapReportingOptIn") private var mapReportingOptIn: Bool = false @State var mapPublishIntervalSecs = 3600 @State var mapPositionPrecision: Double = 14.0