Merge pull request #207 from deltachat/fix-config

tweak some config switches

deltachat-ios/AppDelegate.swift

@@ -193,21 +193,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             }
         }
 
-        if DcConfig.sentboxWatch {
-            DispatchQueue.global(qos: .background).async {
-                while self.state == .running {
-                    dc_perform_sentbox_fetch(mailboxPointer)
-                    dc_perform_sentbox_idle(mailboxPointer)
-                }
+        DispatchQueue.global(qos: .background).async {
+            while self.state == .running {
+                dc_perform_sentbox_fetch(mailboxPointer)
+                dc_perform_sentbox_idle(mailboxPointer)
             }
         }
 
-        if DcConfig.mvboxWatch {
-            DispatchQueue.global(qos: .background).async {
-                while self.state == .running {
-                    dc_perform_mvbox_fetch(mailboxPointer)
-                    dc_perform_mvbox_idle(mailboxPointer)
-                }
+        DispatchQueue.global(qos: .background).async {
+            while self.state == .running {
+                dc_perform_mvbox_fetch(mailboxPointer)
+                dc_perform_mvbox_idle(mailboxPointer)
             }
         }
 

deltachat-ios/Controller/EditSettingsController.swift

@@ -6,13 +6,13 @@ class EditSettingsController: UITableViewController {
     private var statusCellBackup: String?
 
     private lazy var displayNameCell: TextFieldCell = {
-        let cell = TextFieldCell(description: String.localized("display_name"), placeholder: String.localized("display_name"))
+        let cell = TextFieldCell(description: String.localized("pref_your_name"), placeholder: String.localized("pref_your_name"))
         cell.setText(text: DcConfig.displayname ?? nil)
         return cell
     }()
 
     private lazy var statusCell: TextFieldCell = {
-        let cell = TextFieldCell(description: String.localized("status"), placeholder: String.localized("your_status"))
+        let cell = TextFieldCell(description: String.localized("pref_default_status_label"), placeholder: String.localized("pref_default_status_label"))
         cell.setText(text: DcConfig.selfstatus ?? nil)
         return cell
     }()
@@ -27,6 +27,7 @@ class EditSettingsController: UITableViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        title = String.localized("pref_profile_info_headline")
     }
 
     override func viewWillAppear(_ animated: Bool) {

deltachat-ios/Controller/SettingsController.swift

@@ -20,7 +20,6 @@ internal final class SettingsViewController: QuickTableViewController {
     static let watchSentbox: Int = 4
     static let watchMvBox: Int = 5
     static let MvToMvbox: Int = 6
-    static let SaveMimeHeaders: Int = 7
     private typealias SVC = SettingsViewController
 
     override func viewDidLoad() {
@@ -101,30 +100,37 @@ internal final class SettingsViewController: QuickTableViewController {
 
         tableContents = [
             Section(
-                title: String.localized("user_details"),
+                title: String.localized("pref_profile_info_headline"),
                 rows: [
                     //FIXME: fix action callback!
-                    NavigationRow(text: String.localized("display_name"), detailText: .value1(DcConfig.displayname ?? ""), action: {
+                    NavigationRow(text: String.localized("pref_your_name"), detailText: .value1(DcConfig.displayname ?? ""), action: {
                         [weak self] in self?.editNameAndStatus($0, option: SettingsEditOption.DISPLAYNAME)
                     }),
-                    NavigationRow(text: String.localized("status"), detailText: .value1(DcConfig.selfstatus ?? ""), action: {
+                    NavigationRow(text: String.localized("pref_default_status_label"), detailText: .value1(DcConfig.selfstatus ?? ""), action: {
                         [weak self] in self?.editNameAndStatus($0, option: SettingsEditOption.STATUS)
                     }),
-                    TapActionRow(text: String.localized("configure_my_account"), action: { [weak self] in self?.presentAccountSetup($0) }),
+                    TapActionRow(text: String.localized("pref_password_and_account_settings"), action: { [weak self] in self?.presentAccountSetup($0) }),
                 ]
             ),
+
             Section(
-                title: String.localized("flags"),
+                title: String.localized("pref_privacy"),
                 rows: [
-                    SwitchRow(text: String.localized("autocrypt_prefer_e2ee"),
-                              switchValue: DcConfig.e2eeEnabled,
-                              action: editCell(key: SVC.e2eeEnabled)),
                     SwitchRow(text: String.localized("pref_read_receipts"),
                               switchValue: DcConfig.mdnsEnabled,
                               action: editCell(key: SVC.readReceipts)),
+                    SwitchRow(text: String.localized("autocrypt_prefer_e2ee"),
+                              switchValue: DcConfig.e2eeEnabled,
+                              action: editCell(key: SVC.e2eeEnabled)),
+                ]
+            ),
+
+            Section(
+                title: String.localized("menu_advanced"),
+                rows: [
                     SwitchRow(text: String.localized("pref_watch_inbox_folder"),
                               switchValue: DcConfig.inboxWatch,
-                              action: editCell(key: SVC.watchMvBox)),
+                              action: editCell(key: SVC.watchInbox)),
                     SwitchRow(text: String.localized("pref_watch_sent_folder"),
                               switchValue: DcConfig.sentboxWatch,
                               action: editCell(key: SVC.watchSentbox)),
@@ -134,9 +140,6 @@ internal final class SettingsViewController: QuickTableViewController {
                     SwitchRow(text: String.localized("pref_auto_folder_moves"),
                               switchValue: DcConfig.mvboxMove,
                               action: editCell(key: SVC.MvToMvbox)),
-                    SwitchRow(text: String.localized("save_mime_headers"),
-                              switchValue: DcConfig.saveMimeHeaders,
-                              action: editCell(key: SVC.SaveMimeHeaders))
                 ]
             ),
 
@@ -172,8 +175,6 @@ internal final class SettingsViewController: QuickTableViewController {
                     DcConfig.mvboxWatch = value
                 case SVC.MvToMvbox:
                     DcConfig.mvboxMove = value
-                case SVC.SaveMimeHeaders:
-                    DcConfig.saveMimeHeaders = value
                 default:
                     logger.info("unknown key", String(key))
                 }

deltachat-ios/DC/Wrapper.swift

@@ -253,11 +253,6 @@ class DcConfig {
         get { return getInt("show_emails") }
     }
 
-    class var saveMimeHeaders: Bool {
-        set { setBool("save_mime_headers", newValue) }
-        get { return getBool("save_mime_headers") }
-    }
-
     class var configuredEmail: String {
         return getOptStr("configured_addr") ?? ""
     }

deltachat-ios/en.lproj/Localizable.strings

@@ -648,12 +648,6 @@
 "create_backup" = "Create backup";
 "delete_account" = "Delete Account";
 "delete_account_message" = "Are you sure you wante to delete your account data?";
-"display_name" = "Display Name";
-"status" = "Status";
-"configure_my_account" = "Configure my Account";
-"save_mime_headers" = "Save Mime Headers";
-"flags" = "Flags";
-"user_details" = "User Details";
 "danger" = "Danger";
 "creating_backup" = "Creating Backup";
 "group_info" = "Group Info";

tools/untranslated.xml

@@ -23,12 +23,6 @@
     <string name="create_backup">Create backup</string>
     <string name="delete_account">Delete Account</string>
     <string name="delete_account_message">Are you sure you wante to delete your account data?</string>
-    <string name="display_name">Display Name</string>
-    <string name="status">Status</string>
-    <string name="configure_my_account">Configure my Account</string>
-    <string name="save_mime_headers">Save Mime Headers</string>
-    <string name="flags">Flags</string>
-    <string name="user_details">User Details</string>
     <string name="danger">Danger</string>
     <string name="creating_backup">Creating Backup</string>
     <string name="group_info">Group Info</string>