actionCell removed conveninience initializer because it did not work as expected

deltachat-ios/Controller/AccountSetupController.swift

@@ -36,8 +36,9 @@ class AccountSetupController: UITableViewController {
   }()
 
   private lazy var restoreCell: ActionCell = {
-    let cell = ActionCell(title: "Restore from backup")
-    cell.accessibilityIdentifier = "restoreCell"
+		let cell = ActionCell(frame: .zero)
+		cell.actionTitle = "Restore from backup"
+		cell.accessibilityIdentifier = "restoreCell"
     return cell
   }()
 

deltachat-ios/Controller/SettingsController.swift

@@ -13,271 +13,221 @@ import QuickTableViewController
 import UIKit
 
 internal final class SettingsViewController: QuickTableViewController {
-  weak var coordinator: SettingsCoordinator?
+	weak var coordinator: SettingsCoordinator?
 
-  let documentInteractionController = UIDocumentInteractionController()
-  var backupProgressObserver: Any?
-  var configureProgressObserver: Any?
+	let documentInteractionController = UIDocumentInteractionController()
+	var backupProgressObserver: Any?
+	var configureProgressObserver: Any?
 
-  private lazy var hudHandler: HudHandler = {
-    let hudHandler = HudHandler(parentView: self.tableView)
-    return hudHandler
-  }()
+	private lazy var hudHandler: HudHandler = {
+		let hudHandler = HudHandler(parentView: self.tableView)
+		return hudHandler
+	}()
 
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    title = "Settings"
-    documentInteractionController.delegate = self as? UIDocumentInteractionControllerDelegate
-  }
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		title = "Settings"
+		documentInteractionController.delegate = self as? UIDocumentInteractionControllerDelegate
+	}
 
 
-  override func viewDidAppear(_ animated: Bool) {
+	override func viewDidAppear(_ animated: Bool) {
 
-    super.viewDidAppear(animated)
+		super.viewDidAppear(animated)
 		let nc = NotificationCenter.default
-    backupProgressObserver = nc.addObserver(
-      forName: dcNotificationBackupProgress,
-      object: nil,
-      queue: nil
-    ) { notification in
-      if let ui = notification.userInfo {
-        if ui["error"] as! Bool {
-          self.hudHandler.setHudError(ui["errorMessage"] as? String)
-        } else if ui["done"] as! Bool {
-          self.hudHandler.setHudDone(callback: nil)
-        } else {
-          self.hudHandler.setHudProgress(ui["progress"] as! Int)
-        }
-      }
-    }
-    configureProgressObserver = nc.addObserver(
-      forName: dcNotificationConfigureProgress,
-      object: nil,
-      queue: nil
-    ) { notification in
-      if let ui = notification.userInfo {
-        if ui["error"] as! Bool {
-          self.hudHandler.setHudError(ui["errorMessage"] as? String)
-        } else if ui["done"] as! Bool {
-          self.hudHandler.setHudDone(callback: nil)
-        } else {
-          self.hudHandler.setHudProgress(ui["progress"] as! Int)
-        }
-      }
-    }
-  }
-
-  override func viewWillAppear(_ animated: Bool) {
-    super.viewWillAppear(animated)
+		backupProgressObserver = nc.addObserver(
+			forName: dcNotificationBackupProgress,
+			object: nil,
+			queue: nil
+		) { notification in
+			if let ui = notification.userInfo {
+				if ui["error"] as! Bool {
+					self.hudHandler.setHudError(ui["errorMessage"] as? String)
+				} else if ui["done"] as! Bool {
+					self.hudHandler.setHudDone(callback: nil)
+				} else {
+					self.hudHandler.setHudProgress(ui["progress"] as! Int)
+				}
+			}
+		}
+		configureProgressObserver = nc.addObserver(
+			forName: dcNotificationConfigureProgress,
+			object: nil,
+			queue: nil
+		) { notification in
+			if let ui = notification.userInfo {
+				if ui["error"] as! Bool {
+					self.hudHandler.setHudError(ui["errorMessage"] as? String)
+				} else if ui["done"] as! Bool {
+					self.hudHandler.setHudDone(callback: nil)
+				} else {
+					self.hudHandler.setHudProgress(ui["progress"] as! Int)
+				}
+			}
+		}
+	}
+
+	override func viewWillAppear(_ animated: Bool) {
+		super.viewWillAppear(animated)
 		setTable()
-    if #available(iOS 11.0, *) {
-      navigationController?.navigationBar.prefersLargeTitles = true
-    }
-  }
-
-  override func viewWillDisappear(_ animated: Bool) {
-    super.viewWillDisappear(animated)
-    if #available(iOS 11.0, *) {
-      navigationController?.navigationBar.prefersLargeTitles = false
-    }
-  }
-
-  override func viewDidDisappear(_ animated: Bool) {
-    super.viewDidDisappear(animated)
-
-    let nc = NotificationCenter.default
-    if let backupProgressObserver = self.backupProgressObserver {
-      nc.removeObserver(backupProgressObserver)
-    }
-    if let configureProgressObserver = self.configureProgressObserver {
-      nc.removeObserver(configureProgressObserver)
-    }
-  }
-
-  private func setTable() {
-    var backupRows = [
-      TapActionRow(text: "Create backup", action: { [weak self] in self?.createBackup($0) }),
-    ]
-
-    let deleteRow = TapActionRow(text: "Delete Account", action: { [weak self] in self?.deleteAccount($0) })
-
-    tableContents = [
-      Section(
-        title: "User Details",
-        rows: [
+		if #available(iOS 11.0, *) {
+			navigationController?.navigationBar.prefersLargeTitles = true
+		}
+	}
+
+	override func viewWillDisappear(_ animated: Bool) {
+		super.viewWillDisappear(animated)
+		if #available(iOS 11.0, *) {
+			navigationController?.navigationBar.prefersLargeTitles = false
+		}
+	}
+
+	override func viewDidDisappear(_ animated: Bool) {
+		super.viewDidDisappear(animated)
+
+		let nc = NotificationCenter.default
+		if let backupProgressObserver = self.backupProgressObserver {
+			nc.removeObserver(backupProgressObserver)
+		}
+		if let configureProgressObserver = self.configureProgressObserver {
+			nc.removeObserver(configureProgressObserver)
+		}
+	}
+
+	private func setTable() {
+		var backupRows = [
+			TapActionRow(text: "Create backup", action: { [weak self] in self?.createBackup($0) }),
+		]
+
+		let deleteRow = TapActionRow(text: "Delete Account", action: { [weak self] in self?.deleteAccount($0) })
+
+		tableContents = [
+			Section(
+				title: "User Details",
+				rows: [
 					NavigationRow(text: "Display Name", detailText: .value1(MRConfig.displayname ?? ""), action: { [weak self] in self?.editNameAndStatus($0)}),
-          NavigationRow(text: "Status", detailText: .value1(MRConfig.selfstatus ?? ""), action: { [weak self] in self?.editNameAndStatus($0)}),
-          TapActionRow(text: "Configure my Account", action: { [weak self] in self?.presentAccountSetup($0) }),
-        ]
-      ),
-      Section(
-        title: "Flags",
-        rows: [
-          SwitchRow(text: "E2EE enabled", switchValue: MRConfig.e2eeEnabled, action: editCell()),
-          SwitchRow(text: "Read Receipts", switchValue: MRConfig.mdnsEnabled, action: editCell()),
-          SwitchRow(text: "Watch Inbox", switchValue: MRConfig.inboxWatch, action: editCell()),
-          SwitchRow(text: "Watch Sentbox", switchValue: MRConfig.sentboxWatch, action: editCell()),
-          SwitchRow(text: "Watch Mvbox", switchValue: MRConfig.mvboxWatch, action: editCell()),
-          SwitchRow(text: "Move to Mvbox", switchValue: MRConfig.mvboxMove, action: editCell()),
-          SwitchRow(text: "Save Mime Headers", switchValue: MRConfig.saveMimeHeaders, action: editCell()),
-        ]
-      ),
-
-      Section(
-        title: "Backup",
-        rows: backupRows
-      ),
-
-      Section(title: "Danger", rows: [
-        deleteRow,
-      ]),
-    ]
-  }
-
-  // FIXME: simplify this method
-  // swiftlint:disable cyclomatic_complexity
-  private func editCell() -> (Row) -> Void {
-    return { [weak self] sender in
-      logger.info("row edit", sender.text)
-
-      let title = sender.text
-      let subtitle: String = sender.detailText?.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
-
-        switch title {
-        case "E2EE enabled":
-          MRConfig.e2eeEnabled = value
-        case "Read Receipts":
-          MRConfig.mdnsEnabled = value
-        case "Watch Inbox":
-          MRConfig.inboxWatch = value
-        case "Watch Sentbox":
-          MRConfig.sentboxWatch = value
-        case "Watch Mvbox":
-          MRConfig.mvboxWatch = value
-        case "Move to Mvbox":
-          MRConfig.mvboxMove = value
-        case "Save Mime Headers":
-          MRConfig.saveMimeHeaders = value
-        default:
-          logger.info("unknown title", title)
-        }
-        dc_configure(mailboxPointer)
-        return
-      }
-
-      let confirmAction = UIAlertAction(title: "Save", style: .default) { _ in
-        guard let textFields = alertController.textFields,
-          !textFields.isEmpty else {
-          // Could not find textfield
-          return
-        }
-
-        let field = textFields[0]
-
-        // TODO: add field validation
-        var needRefresh = false
-
-        switch title {
-        case "Display Name":
-          MRConfig.displayname = field.text
-          needRefresh = true
-        case "Status":
-          MRConfig.selfstatus = field.text
-          needRefresh = true
-        default:
-          logger.info("unknown title", title)
-        }
-
-        if needRefresh {
-          dc_configure(mailboxPointer)
-          self?.setTable()
-          self?.tableView.reloadData()
-        }
-      }
-
-      let cancelAction = UIAlertAction(title: "Cancel", style: .cancel) { _ in
-        logger.info("canceled")
-      }
-
-      alertController.addTextField { textField in
-        textField.placeholder = subtitle
-      }
-
-      alertController.addAction(confirmAction)
-      alertController.addAction(cancelAction)
-
-      self?.present(alertController, animated: true, completion: nil)
-    }
-  }
-
-  private func createBackup(_: Row) {
-    // if let documents = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.delta.chat.ios")?.path {
-
-    let documents = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)
-    if !documents.isEmpty {
-      logger.info("create backup in \(documents)")
-      hudHandler.showBackupHud("Creating Backup")
-      DispatchQueue.main.async {
-        dc_imex(mailboxPointer, DC_IMEX_EXPORT_BACKUP, documents[0], nil)
-      }
-    } else {
-      logger.error("document directory not found")
-    }
-  }
-
-  private func configure(_: Row) {
-    hudHandler.showBackupHud("Configuring account")
-    dc_configure(mailboxPointer)
-  }
-
-  private func deleteAccount(_: Row) {
-    logger.info("deleting account")
-    guard let appDelegate = UIApplication.shared.delegate as? AppDelegate else {
-      return
-    }
-
-    let dbfile = appDelegate.dbfile()
-    let dburl = URL(fileURLWithPath: dbfile, isDirectory: false)
-    let alert = UIAlertController(title: "Delete Account", message: "Are you sure you wante to delete your account data?", preferredStyle: .alert)
-
-    alert.addAction(UIAlertAction(title: "Delete", style: .destructive, handler: { _ in
-      appDelegate.stop()
-      appDelegate.close()
-      do {
-        try FileManager.default.removeItem(at: dburl)
-      } catch {
-        logger.error("failed to delete db: \(error)")
-      }
-
-      appDelegate.open()
-      appDelegate.start()
-
-      // refresh our view
-      self.setTable()
-      self.tableView.reloadData()
-
-      self.dismiss(animated: true, completion: nil)
-    }))
-    alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
-
-    present(alert, animated: true, completion: nil)
-  }
-
-  private func presentAccountSetup(_: Row) {
-    coordinator?.showAccountSetupController()
-  }
+					NavigationRow(text: "Status", detailText: .value1(MRConfig.selfstatus ?? ""), action: { [weak self] in self?.editNameAndStatus($0)}),
+					TapActionRow(text: "Configure my Account", action: { [weak self] in self?.presentAccountSetup($0) }),
+				]
+			),
+			Section(
+				title: "Flags",
+				rows: [
+					SwitchRow(text: "E2EE enabled", switchValue: MRConfig.e2eeEnabled, action: editCell()),
+					SwitchRow(text: "Read Receipts", switchValue: MRConfig.mdnsEnabled, action: editCell()),
+					SwitchRow(text: "Watch Inbox", switchValue: MRConfig.inboxWatch, action: editCell()),
+					SwitchRow(text: "Watch Sentbox", switchValue: MRConfig.sentboxWatch, action: editCell()),
+					SwitchRow(text: "Watch Mvbox", switchValue: MRConfig.mvboxWatch, action: editCell()),
+					SwitchRow(text: "Move to Mvbox", switchValue: MRConfig.mvboxMove, action: editCell()),
+					SwitchRow(text: "Save Mime Headers", switchValue: MRConfig.saveMimeHeaders, action: editCell()),
+				]
+			),
+
+			Section(
+				title: "Backup",
+				rows: backupRows
+			),
+
+			Section(title: "Danger", rows: [
+				deleteRow,
+				]),
+		]
+	}
+
+	// FIXME: simplify this method
+	// swiftlint:disable cyclomatic_complexity
+	private func editCell() -> (Row) -> Void {
+		return { [weak self] sender in
+			logger.info("row edit", sender.text)
+
+			let title = sender.text
+			let subtitle: String = sender.detailText?.text ?? ""
+
+
+			if let sender = sender as? SwitchRow {
+				logger.info("got bool switch")
+				let value = sender.switchValue
+
+				switch title {
+				case "E2EE enabled":
+					MRConfig.e2eeEnabled = value
+				case "Read Receipts":
+					MRConfig.mdnsEnabled = value
+				case "Watch Inbox":
+					MRConfig.inboxWatch = value
+				case "Watch Sentbox":
+					MRConfig.sentboxWatch = value
+				case "Watch Mvbox":
+					MRConfig.mvboxWatch = value
+				case "Move to Mvbox":
+					MRConfig.mvboxMove = value
+				case "Save Mime Headers":
+					MRConfig.saveMimeHeaders = value
+				default:
+					logger.info("unknown title", title)
+				}
+				dc_configure(mailboxPointer)
+				return
+			}
+		}
+	}
+
+	private func createBackup(_: Row) {
+		// if let documents = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.delta.chat.ios")?.path {
+
+		let documents = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)
+		if !documents.isEmpty {
+			logger.info("create backup in \(documents)")
+			hudHandler.showBackupHud("Creating Backup")
+			DispatchQueue.main.async {
+				dc_imex(mailboxPointer, DC_IMEX_EXPORT_BACKUP, documents[0], nil)
+			}
+		} else {
+			logger.error("document directory not found")
+		}
+	}
+
+	private func configure(_: Row) {
+		hudHandler.showBackupHud("Configuring account")
+		dc_configure(mailboxPointer)
+	}
+
+	private func deleteAccount(_: Row) {
+		logger.info("deleting account")
+		guard let appDelegate = UIApplication.shared.delegate as? AppDelegate else {
+			return
+		}
+
+		let dbfile = appDelegate.dbfile()
+		let dburl = URL(fileURLWithPath: dbfile, isDirectory: false)
+		let alert = UIAlertController(title: "Delete Account", message: "Are you sure you wante to delete your account data?", preferredStyle: .alert)
+
+		alert.addAction(UIAlertAction(title: "Delete", style: .destructive, handler: { _ in
+			appDelegate.stop()
+			appDelegate.close()
+			do {
+				try FileManager.default.removeItem(at: dburl)
+			} catch {
+				logger.error("failed to delete db: \(error)")
+			}
+
+			appDelegate.open()
+			appDelegate.start()
+
+			// refresh our view
+			self.setTable()
+			self.tableView.reloadData()
+
+			self.dismiss(animated: true, completion: nil)
+		}))
+		alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+
+		present(alert, animated: true, completion: nil)
+	}
+
+	private func presentAccountSetup(_: Row) {
+		coordinator?.showAccountSetupController()
+	}
 
 	private func editNameAndStatus(_ row: Row) {
 		guard let option = SettingsEditOption(rawValue: row.text) else { return }

deltachat-ios/View/ActionCell.swift

@@ -30,13 +30,6 @@ class ActionCell: UITableViewCell {
     return label
   }()
 
-  // use this constructor if cell won't be reused
-  convenience init(title: String) {
-    self.init(style: .default, reuseIdentifier: nil)
-    actionTitle = title
-    selectionStyle = .none
-  }
-
   override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
     super.init(style: style, reuseIdentifier: reuseIdentifier)
     setupSubviews()