Browse Source

pass dcContext to AccountSetupCoordinator

B. Petersen 5 years ago
parent
commit
e45a60a3e1

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

@@ -238,7 +238,6 @@ class AccountSetupController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         title = String.localized("login_header")
-        // navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Close", style: .plain, target: self, action: #selector(closeButtonPressed))
         navigationItem.rightBarButtonItem = loginButton
     }
 

+ 6 - 4
deltachat-ios/Coordinator/AppCoordinator.swift

@@ -104,7 +104,7 @@ class AppCoordinator: NSObject, Coordinator {
     func presentLoginController() {
         let accountSetupController = AccountSetupController(dcContext: dcContext, editView: false)
         let accountSetupNav = DcNavigationController(rootViewController: accountSetupController)
-        let coordinator = AccountSetupCoordinator(navigationController: accountSetupNav)
+        let coordinator = AccountSetupCoordinator(dcContext: dcContext, navigationController: accountSetupNav)
         childCoordinators.append(coordinator)
         accountSetupController.coordinator = coordinator
         rootViewController.present(accountSetupNav, animated: false, completion: nil)
@@ -189,7 +189,7 @@ class SettingsCoordinator: Coordinator {
 
     func showAccountSetupController() {
         let accountSetupVC = AccountSetupController(dcContext: dcContext, editView: true)
-        let coordinator = AccountSetupCoordinator(navigationController: navigationController)
+        let coordinator = AccountSetupCoordinator(dcContext: dcContext, navigationController: navigationController)
         childCoordinators.append(coordinator)
         accountSetupVC.coordinator = coordinator
         navigationController.pushViewController(accountSetupVC, animated: true)
@@ -202,7 +202,7 @@ class SettingsCoordinator: Coordinator {
 
     func showLoginController() {
         let accountSetupVC = AccountSetupController(dcContext: dcContext, editView: false)
-        let coordinator = AccountSetupCoordinator(navigationController: navigationController)
+        let coordinator = AccountSetupCoordinator(dcContext: dcContext, navigationController: navigationController)
         childCoordinators.append(coordinator)
         accountSetupVC.coordinator = coordinator
         let accountSetupNavigationController = DcNavigationController(rootViewController: accountSetupVC)
@@ -221,9 +221,11 @@ class SettingsCoordinator: Coordinator {
 }
 
 class AccountSetupCoordinator: Coordinator {
+    var dcContext: DcContext
     let navigationController: UINavigationController
 
-    init(navigationController: UINavigationController) {
+    init(dcContext: DcContext, navigationController: UINavigationController) {
+        self.dcContext = dcContext
         self.navigationController = navigationController
     }