From eb7289c1509037faaf6173264663e8d0cbaedb44 Mon Sep 17 00:00:00 2001
From: ronaldheft <ron@ronaldheft.com>
Date: Fri, 26 Aug 2022 20:20:26 -0400
Subject: [PATCH] Fix the incorrect server config being persisted

---
 ios/App/App/plugins/AbsDatabase.swift | 3 ++-
 ios/App/Shared/util/Database.swift    | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ios/App/App/plugins/AbsDatabase.swift b/ios/App/App/plugins/AbsDatabase.swift
index 43e1969b..7f3d9f54 100644
--- a/ios/App/App/plugins/AbsDatabase.swift
+++ b/ios/App/App/plugins/AbsDatabase.swift
@@ -51,7 +51,8 @@ public class AbsDatabase: CAPPlugin {
         config.token = token
         
         Store.serverConfig = config
-        call.resolve(convertServerConnectionConfigToJSON(config: config))
+        let savedConfig = Store.serverConfig // Fetch the latest value
+        call.resolve(convertServerConnectionConfigToJSON(config: savedConfig!))
     }
     @objc func removeServerConnectionConfig(_ call: CAPPluginCall) {
         let id = call.getString("serverConnectionConfigId", "")
diff --git a/ios/App/Shared/util/Database.swift b/ios/App/Shared/util/Database.swift
index 6aaa919d..8fd116b8 100644
--- a/ios/App/Shared/util/Database.swift
+++ b/ios/App/Shared/util/Database.swift
@@ -33,6 +33,8 @@ class Database {
                 NSLog("failed to update server config")
                 debugPrint(error)
             }
+            
+            setLastActiveConfigIndex(index: existing.index)
         } else {
             if config.index == 0 {
                 let lastConfig: ServerConnectionConfig? = realm.objects(ServerConnectionConfig.self).last
@@ -52,9 +54,9 @@ class Database {
                 NSLog("failed to save server config")
                 debugPrint(exception)
             }
+            
+            setLastActiveConfigIndex(index: config.index)
         }
-        
-        setLastActiveConfigIndex(index: config.index)
     }
     
     public func deleteServerConnectionConfig(id: String) {