Improve defaults db access in notification debugging ui

monal-im · Jan 4, 2025 · c8e488f · c8e488f
1 parent 15a2c3b
commit c8e488f
Showing 1 changed file with 17 additions and 18 deletions.
diff --git a/Monal/Classes/NotificationDebugging.swift b/Monal/Classes/NotificationDebugging.swift
@@ -11,22 +11,32 @@ import OrderedCollections
 class NotificationDebuggingDefaultsDB: ObservableObject {
     @defaultsDB("lastAppexStart")
     var lastAppexStart: Date?
+
+    @defaultsDB("selectedPushServer")
+    var selectedPushServer: String
 }
 
 struct NotificationDebugging: View {
     private let applePushEnabled: Bool
     private let applePushToken: String
     private let xmppAccountInfo: [xmpp]
-
+    
     private let availablePushServers: Dictionary<String, String>
-
+    
     @State private var pushPermissionEnabled = false // state because we get this value through an async call
     @State private var showPushToken = false
-
-    @State private var selectedPushServer: String
 
     @ObservedObject var notificationDebuggingDefaultsDB = NotificationDebuggingDefaultsDB()
+
+    init() {
+        self.applePushEnabled = MLXMPPManager.sharedInstance().hasAPNSToken;
+        self.applePushToken = MLXMPPManager.sharedInstance().pushToken;
+        self.xmppAccountInfo = MLXMPPManager.sharedInstance().connectedXMPP as! [xmpp]
 
+        // push server selector
+        self.availablePushServers = HelperTools.getAvailablePushServers()
+    }
+
     var body: some View {
         Form {
             Group {
@@ -83,14 +93,13 @@ struct NotificationDebugging: View {
                 }
             }
             Section(header: Text("Pushserver Region").font(.title3)) {
-                Picker(selection: $selectedPushServer, label: Text("Push Server")) {
+                Picker(selection: $notificationDebuggingDefaultsDB.selectedPushServer, label: Text("Push Server")) {
                     ForEach(self.availablePushServers.sorted(by: >), id: \.key) { pushServerFqdn, pushServerName in
                         Text(pushServerName).tag(pushServerFqdn)
                     }
                 }.pickerStyle(.menu)//.menuStyle(.borderlessButton)
-                .onChange(of: selectedPushServer) { pushServerFqdn in
-                    DDLogDebug("Selected \(pushServerFqdn) as push server")
-                    HelperTools.defaultsDB().setValue(pushServerFqdn, forKey: "selectedPushServer")
+                .onChange(of: notificationDebuggingDefaultsDB.selectedPushServer) { pushServerFqdn in
+                    DDLogDebug("Selected \(pushServerFqdn) as push server...")
                     // enable push again to switch to the selected server
                     for account in self.xmppAccountInfo {
                         account.enablePush()
@@ -113,16 +122,6 @@ struct NotificationDebugging: View {
             }
         });
     }
-
-    init() {
-        self.applePushEnabled = MLXMPPManager.sharedInstance().hasAPNSToken;
-        self.applePushToken = MLXMPPManager.sharedInstance().pushToken;
-        self.xmppAccountInfo = MLXMPPManager.sharedInstance().connectedXMPP as! [xmpp]
-
-        // push server selector
-        self.availablePushServers = HelperTools.getAvailablePushServers()
-        self.selectedPushServer = HelperTools.defaultsDB().object(forKey: "selectedPushServer") as! String
-    }
 }
 
 struct PushSettings_Previews: PreviewProvider {