Merge pull request #1313 from deltachat/fix_account_setup

Fix account setup

deltachat-ios/Controller/AccountSetupController.swift

@@ -677,8 +677,10 @@ class AccountSetupController: UITableViewController, ProgressAlertHandler {
             notification in
             if let ui = notification.userInfo {
                 if ui["error"] as! Bool {
+                    self.dcAccounts.maybeStartIo()
                     self.updateProgressAlert(error: ui["errorMessage"] as? String)
                 } else if ui["done"] as! Bool {
+                    self.dcAccounts.maybeStartIo()
                     self.updateProgressAlertSuccess(completion: self.handleLoginSuccess)
                 } else {
                     self.updateProgressAlertValue(value: ui["progress"] as? Int)

deltachat-ios/Controller/SettingsController.swift

@@ -257,7 +257,12 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         super.viewDidAppear(animated)
         addProgressAlertListener(dcAccounts: dcAccounts, progressName: dcNotificationImexProgress) { [weak self] in
             guard let self = self else { return }
-            self.progressAlert?.dismiss(animated: true, completion: nil)
+
+            self.progressAlert?.dismiss(animated: true) {
+                if let appDelegate = UIApplication.shared.delegate as? AppDelegate {
+                    appDelegate.reloadDcContext()
+                }
+            }
         }
         connectivityChangedObserver = NotificationCenter.default.addObserver(forName: dcNotificationConnectivityChanged,
                                                                              object: nil,

deltachat-ios/Controller/WelcomeViewController.swift

@@ -21,8 +21,7 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
             accountSetupController.onLoginSuccess = {
                 [weak self] in
                 if let appDelegate = UIApplication.shared.delegate as? AppDelegate {
-                    appDelegate.appCoordinator.presentTabBarController()
-                    appDelegate.appCoordinator.popTabsToRootViewControllers()
+                    appDelegate.reloadDcContext()
                 }
             }
             self.navigationController?.pushViewController(accountSetupController, animated: true)
@@ -60,7 +59,7 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
             let profileInfoController = ProfileInfoViewController(context: self.dcContext)
             profileInfoController.onClose = {
                 if let appDelegate = UIApplication.shared.delegate as? AppDelegate {
-                    appDelegate.appCoordinator.presentTabBarController()
+                    appDelegate.reloadDcContext()
                 }
             }
             self.navigationController?.setViewControllers([profileInfoController], animated: true)
@@ -126,18 +125,21 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
     // MARK: - actions
 
     private func createAccountFromQRCode(qrCode: String) {
-        let success = dcContext.setConfigFromQR(qrCode: qrCode)
-        if success {
-            addProgressAlertListener(dcAccounts: dcAccounts, progressName: dcNotificationConfigureProgress, onSuccess: handleLoginSuccess)
-            showProgressAlert(title: String.localized("login_header"), dcContext: dcContext)
-            dcAccounts.stopIo()
-            let accountId = dcAccounts.add()
-            if accountId != 0 {
-                self.dcContext = dcAccounts.get(id: accountId)
+        // ensure we're configuring on an empty new account
+        let accountId = dcAccounts.getSelected().isConfigured() ?
+            dcAccounts.add() : dcAccounts.getSelected().id
+
+        if accountId != 0 {
+            self.dcContext = dcAccounts.get(id: accountId)
+            let success = dcContext.setConfigFromQR(qrCode: qrCode)
+            if success {
+                addProgressAlertListener(dcAccounts: dcAccounts, progressName: dcNotificationConfigureProgress, onSuccess: handleLoginSuccess)
+                showProgressAlert(title: String.localized("login_header"), dcContext: dcContext)
+                dcAccounts.stopIo()
+                dcContext.configure()
+            } else {
+                accountCreationErrorAlert()
             }
-            dcContext.configure()
-        } else {
-            accountCreationErrorAlert()
         }
     }
 

deltachat-ios/Handler/ProgressAlertHandler.swift

@@ -48,7 +48,9 @@ extension ProgressAlertHandler {
             self.progressAlert?.dismiss(animated: false) {
                 let errorAlert = UIAlertController(title: String.localized("error"), message: message, preferredStyle: .alert)
                 errorAlert.addAction(UIAlertAction(title: String.localized("ok"), style: .default, handler: nil))
-                self.present(errorAlert, animated: true, completion: nil)
+                // sometimes error messages are not shown and we get the same error as above
+                // as a workaround we disable animated here as well
+                self.present(errorAlert, animated: false, completion: nil)
             }
         })
     }