Sfoglia il codice sorgente

show current settings in advanced settings

B. Petersen 5 anni fa
parent
commit
c93e7ad25e

+ 18 - 1
deltachat-ios/Controller/AccountSetupController.swift

@@ -447,7 +447,24 @@ class AccountSetupController: UITableViewController {
         if sections[section] == basicSection {
             return String.localized("login_no_servers_hint")
         } else if sections[section] == advancedSection {
-            return String.localized("login_subheader")
+            if advancedSectionShowing && dcContext.isConfigured() {
+                var info = "Current settings:\n"
+                let serverFlags = Int(dcContext.getConfig("configured_server_flags") ?? "") ?? 0
+                info += "IMAP "
+                info += SecurityConverter.convertHexToString(type: .IMAPSecurity, hex: serverFlags&0x700) + " "
+                info += (dcContext.getConfig("configured_mail_user") ?? "unset") + ":***@"
+                info += (dcContext.getConfig("configured_mail_server") ?? "unset") + ":"
+                info += (dcContext.getConfig("configured_mail_port") ?? "unset") + "\n"
+                info += "SMTP "
+                info += SecurityConverter.convertHexToString(type: .SMTPSecurity, hex: serverFlags&0x70000) + " "
+                info += (dcContext.getConfig("configured_send_user") ?? "unset") + ":***@"
+                info += (dcContext.getConfig("configured_send_server") ?? "unset") +  ":"
+                info += (dcContext.getConfig("configured_send_port") ?? "unset") + "\n\n"
+                info += String.localized("login_subheader")
+                return info
+            } else {
+                return String.localized("login_subheader")
+            }
         } else if sections[section] == folderSection {
             return String.localized("pref_auto_folder_moves_explain")
         } else {

+ 5 - 0
deltachat-ios/DC/Wrapper.swift

@@ -129,6 +129,10 @@ class DcContext {
     func emptyServer(flags: Int) {
         dc_empty_server(contextPointer, UInt32(flags))
     }
+
+    func isConfigured() -> Bool {
+        return dc_is_configured(contextPointer) != 0
+    }
 }
 
 class DcConfig {
@@ -329,6 +333,7 @@ class DcConfig {
         get { return getConfigInt("show_emails") }
     }
 
+    // do not use. use DcContext::isConfigured() instead
     class var configured: Bool {
         return getConfigBool("configured")
     }