coding

Share/NCShareExtension.swift

@@ -431,6 +431,17 @@ class NCShareExtension: UIViewController, NCListCellDelegate, NCEmptyDataSetDele
             
             if let vcAccountRequest = UIStoryboard(name: "NCAccountRequest", bundle: nil).instantiateInitialViewController() as? NCAccountRequest {
                
+                // Only here change the active account 
+                for account in accounts {
+                    if account.account == self.activeAccount.account {
+                        account.active = true
+                    } else {
+                        account.active = false
+                    }
+                }
+                // reorder
+                
+                vcAccountRequest.activeAccount = self.activeAccount
                 vcAccountRequest.accounts = accounts
                 vcAccountRequest.enableTimerProgress = false
                 vcAccountRequest.enableAddAccount = false

iOSClient/Account Request/NCAccountRequest.swift

@@ -43,6 +43,7 @@ class NCAccountRequest: UIViewController {
     @IBOutlet weak var progressView: UIProgressView!
     
     public var accounts: [tableAccount] = []
+    public var activeAccount: tableAccount?
     public let heightCell: CGFloat = 60
     public var enableTimerProgress: Bool = true
     public var enableAddAccount: Bool = false
@@ -169,7 +170,6 @@ extension NCAccountRequest: UITableViewDelegate {
         } else {
         
             let account = accounts[indexPath.row]
-            let activeAccount = NCManageDatabase.shared.getActiveAccount()
             if account.account != activeAccount?.account {
                 dismiss(animated: true) {
                     self.delegate?.changeAccountRequestAddAccount(account: account.account)

iOSClient/AppDelegate.swift

@@ -629,6 +629,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             
             if let vcAccountRequest = UIStoryboard(name: "NCAccountRequest", bundle: nil).instantiateInitialViewController() as? NCAccountRequest {
                
+                vcAccountRequest.activeAccount = NCManageDatabase.shared.getActiveAccount()
                 vcAccountRequest.accounts = accounts
                 vcAccountRequest.enableTimerProgress = true
                 vcAccountRequest.enableAddAccount = false

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -690,6 +690,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
             
             if let vcAccountRequest = UIStoryboard(name: "NCAccountRequest", bundle: nil).instantiateInitialViewController() as? NCAccountRequest {
                
+                vcAccountRequest.activeAccount = NCManageDatabase.shared.getActiveAccount()
                 vcAccountRequest.accounts = accounts
                 vcAccountRequest.enableTimerProgress = false
                 vcAccountRequest.enableAddAccount = true