marinofaggiana 4 years ago
parent
commit
fdde27aed7
2 changed files with 1 additions and 4 deletions
  1. 0 2
      iOSClient/AppDelegate.swift
  2. 1 2
      iOSClient/Login/NCLoginWeb.swift

+ 0 - 2
iOSClient/AppDelegate.swift

@@ -467,7 +467,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             if activeLoginWeb?.view.window == nil {
                 activeLoginWeb = UIStoryboard(name: "CCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLoginWeb") as? NCLoginWeb
                 activeLoginWeb?.urlBase = NCBrandOptions.shared.loginBaseUrl
-                activeLoginWeb?.account = account
                 showLoginViewController(activeLoginWeb, contextViewController: viewController)
             }
             
@@ -476,7 +475,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             if activeLoginWeb?.view.window == nil {
                 activeLoginWeb = UIStoryboard(name: "CCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLoginWeb") as? NCLoginWeb
                 activeLoginWeb?.urlBase = urlBase
-                activeLoginWeb?.account = account
                 showLoginViewController(activeLoginWeb, contextViewController: viewController)
             }
             

+ 1 - 2
iOSClient/Login/NCLoginWeb.swift

@@ -33,7 +33,6 @@ class NCLoginWeb: UIViewController {
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
 
     @objc var urlBase = ""
-    @objc var account = ""
     
     @objc var loginFlowV2Available = false
     @objc var loginFlowV2Token = ""
@@ -168,7 +167,7 @@ class NCLoginWeb: UIViewController {
                     selected: account.active == true,
                     on: account.active == true,
                     action: { menuAction in
-                        if self.account != account.account {
+                        if self.appDelegate.account != account.account {
                             NCManageDatabase.shared.setAccountActive(account.account)
                             self.dismiss(animated: true) {
                                 self.appDelegate.settingAccount(account.account, urlBase: account.urlBase, user: account.user, userId: account.userId, password: CCUtility.getPassword(account.account))