configured values for settings

deltachat-ios/TopViews/SettingsController.swift

@@ -130,8 +130,8 @@ internal final class SettingsViewController: QuickTableViewController {
     }
 
     private func setTable() {
-        var basicsRows: [Row & RowStyle] = [
-            NavigationRow(title: "Email", subtitle: .rightAligned(MRConfig.addr ?? ""), action: { _ in }),
+        let basicsRows: [Row & RowStyle] = [
+            NavigationRow(title: "Email", subtitle: .rightAligned(MRConfig.addr ?? ""), action: editCell()),
             NavigationRow(title: "Password", subtitle: .rightAligned("********"), action: editCell()),
             TapActionRow(title: "Configure", action: { [weak self] in self?.configure($0) }),
         ]
@@ -140,9 +140,7 @@ internal final class SettingsViewController: QuickTableViewController {
             TapActionRow(title: "Restore from backup", action: { [weak self] in self?.restoreBackup($0) }),
         ]
 
-        let ud = UserDefaults.standard
-        if ud.bool(forKey: Constants.Keys.deltachatUserProvidedCredentialsKey) {
-            basicsRows.removeLast()
+        if MRConfig.configured {
             backupRows.removeLast()
         }
 
@@ -163,13 +161,13 @@ internal final class SettingsViewController: QuickTableViewController {
             Section(
                 title: "Advanced",
                 rows: [
-                    NavigationRow(title: "IMAP Server", subtitle: .rightAligned(MRConfig.mailServer ?? ""), action: editCell()),
-                    NavigationRow(title: "IMAP User", subtitle: .rightAligned(MRConfig.mailUser ?? ""), action: editCell()),
-                    NavigationRow(title: "IMAP Port", subtitle: .rightAligned(MRConfig.mailPort ?? ""), action: editCell()),
+                    NavigationRow(title: "IMAP Server", subtitle: .rightAligned(MRConfig.mailServer ?? MRConfig.configuredMailServer), action: editCell()),
+                    NavigationRow(title: "IMAP User", subtitle: .rightAligned(MRConfig.mailUser ?? MRConfig.configuredMailUser), action: editCell()),
+                    NavigationRow(title: "IMAP Port", subtitle: .rightAligned(MRConfig.mailPort ?? MRConfig.configuredMailPort), action: editCell()),
 
-                    NavigationRow(title: "SMTP Server", subtitle: .rightAligned(MRConfig.sendServer ?? ""), action: editCell()),
-                    NavigationRow(title: "SMTP User", subtitle: .rightAligned(MRConfig.sendUser ?? ""), action: editCell()),
-                    NavigationRow(title: "SMTP Port", subtitle: .rightAligned(MRConfig.sendPort ?? ""), action: editCell()),
+                    NavigationRow(title: "SMTP Server", subtitle: .rightAligned(MRConfig.sendServer ?? MRConfig.configuredSendServer), action: editCell()),
+                    NavigationRow(title: "SMTP User", subtitle: .rightAligned(MRConfig.sendUser ?? MRConfig.configuredSendUser), action: editCell()),
+                    NavigationRow(title: "SMTP Port", subtitle: .rightAligned(MRConfig.sendPort ?? MRConfig.configuredSendPort), action: editCell()),
                     NavigationRow(title: "SMTP Password", subtitle: .rightAligned("********"), action: editCell()),
                 ]
             ),
@@ -204,6 +202,13 @@ internal final class SettingsViewController: QuickTableViewController {
             let subtitle: String = sender.subtitle?.text ?? ""
             let alertController = UIAlertController(title: title, message: nil, preferredStyle: .alert)
 
+            if title == "Email" {
+                if MRConfig.configured {
+                    // Don't change emails in the running system
+                    return
+                }
+            }
+            
             if let sender = sender as? SwitchRow {
                 logger.info("got bool switch")
                 let value = sender.switchValue
@@ -242,6 +247,8 @@ internal final class SettingsViewController: QuickTableViewController {
                 var needRefresh = false
 
                 switch title {
+                case "Email":
+                    MRConfig.addr = field.text
                 case "Password":
                     MRConfig.mailPw = field.text
                 case "Display Name":
@@ -304,8 +311,7 @@ internal final class SettingsViewController: QuickTableViewController {
     }
 
     private func restoreBackup(_: Row) {
-        let ud = UserDefaults.standard
-        if ud.bool(forKey: Constants.Keys.deltachatUserProvidedCredentialsKey) {
+        if MRConfig.configured {
             return
         }
 
@@ -338,11 +344,6 @@ internal final class SettingsViewController: QuickTableViewController {
     }
 
     private func configure(_: Row) {
-        let ud = UserDefaults.standard
-        if ud.bool(forKey: Constants.Keys.deltachatUserProvidedCredentialsKey) {
-            return
-        }
-
         let appDelegate = UIApplication.shared.delegate as! AppDelegate
         showBackupHud("Configuring account")
         appDelegate.stop()

deltachat-ios/Wrapper.swift

@@ -318,7 +318,11 @@ class MRConfig {
         let p = dc_get_config(mailboxPointer, key)
 
         if let pSafe = p {
-            return String(cString: pSafe)
+            let c = String(cString: pSafe)
+            if c == "" {
+                return nil
+            }
+            return c
         }
 
         return nil
@@ -578,4 +582,76 @@ class MRConfig {
             return getBool("save_mime_headers")
         }
     }
+
+    class var configuredEmail: String {
+        get {
+            return getOptStr("configured_addr") ?? ""
+        }
+        set {}
+    }
+    class var configuredMailServer: String {
+        get {
+            return getOptStr("configured_mail_server") ?? ""
+        }
+        set {}
+    }
+    class var configuredMailUser: String {
+        get {
+            return getOptStr("configured_mail_user") ?? ""
+        }
+        set {}
+    }
+    class var configuredMailPw: String {
+        get {
+            return getOptStr("configured_mail_pw") ?? ""
+        }
+        set {}
+    }
+    class var configuredMailPort: String {
+        get {
+            return getOptStr("configured_mail_port") ?? ""
+        }
+        set {}
+    }
+    class var configuredSendServer: String {
+        get {
+            return getOptStr("configured_send_server") ?? ""
+        }
+        set {}
+    }
+    class var configuredSendUser: String {
+        get {
+            return getOptStr("configured_send_user") ?? ""
+        }
+        set {}
+    }
+    class var configuredSendPw: String {
+        get {
+            return getOptStr("configured_send_pw") ?? ""
+        }
+        set {}
+    }
+    class var configuredSendPort: String {
+        get {
+            return getOptStr("configured_send_port") ?? ""
+        }
+        set {}
+    }
+
+    class var configuredServerFlags: String {
+        get {
+            return getOptStr("configured_server_flags") ?? ""
+        }
+        set {}
+    }
+
+    /**
+     * Was configured executed beforeß
+     */
+    class var configured: Bool {
+        get {
+            return getBool("configured")
+        }
+        set {}
+    }
 }