coding

iOSClient/AppDelegate.h

@@ -91,8 +91,6 @@
 @property (nonatomic, retain) id activeViewController;
 
 @property (nonatomic, retain) CCMain *activeMain;
-@property (nonatomic, retain) CCMain *homeMain;
-
 @property (nonatomic, retain) NCFiles *activeFiles;
 @property (nonatomic, retain) NCFavorite *activeFavorite;
 @property (nonatomic, retain) NCMedia *activeMedia;

iOSClient/Main/CCMain.m

@@ -373,7 +373,6 @@
     if ([appDelegate.listMainVC count] == 0 || _isRoot) {
         
         // This is Root home main add list
-        appDelegate.homeMain = self;
         _isRoot = YES;
         _serverUrl = [[NCUtility shared] getHomeServerWithUrlBase:appDelegate.urlBase account:appDelegate.account];
         [appDelegate.listMainVC setObject:self forKey:_serverUrl];

iOSClient/Main/Create cloud/NCCreateFormUploadScanDocument.swift

@@ -748,9 +748,9 @@ class NCCreateScanDocument : NSObject, ImageScannerControllerDelegate {
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
     var viewController: UIViewController?
     
-    func openScannerDocument(viewController: UIViewController) {
+    func openScannerDocument() {
         
-        self.viewController = viewController
+        self.viewController = self.appDelegate.window.rootViewController
         
         let scannerVC = ImageScannerController()
         scannerVC.imageScannerDelegate = self

iOSClient/Main/Menu/AppDelegate+Menu.swift

@@ -113,7 +113,7 @@ extension AppDelegate {
                 title: NSLocalizedString("_scans_document_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "scan"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 action: { menuAction in
-                    NCCreateScanDocument.sharedInstance.openScannerDocument(viewController: appDelegate.activeMain)
+                    NCCreateScanDocument.sharedInstance.openScannerDocument()
                 }
             )
         )

iOSClient/ScanDocument/ScanCollectionView.swift

@@ -132,7 +132,7 @@ class DragDropViewController: UIViewController {
     
     @IBAction func add(sender: UIButton) {
         
-        NCCreateScanDocument.sharedInstance.openScannerDocument(viewController: self)
+        NCCreateScanDocument.sharedInstance.openScannerDocument()
     }
     
     @IBAction func transferDown(sender: UIButton) {

iOSClient/Settings/NCEndToEndInitialize.swift

@@ -187,7 +187,7 @@ class NCEndToEndInitialize : NSObject  {
                     passphraseTextField?.placeholder = "Enter passphrase (12 words)"
                 }
                 
-                self.appDelegate.activeMain.present(alertController, animated: true)
+                self.appDelegate.window.rootViewController?.present(alertController, animated: true)
                 
             } else if errorCode != 0 {
                 
@@ -274,7 +274,7 @@ class NCEndToEndInitialize : NSObject  {
                     }
                     
                     alertController.addAction(OKAction)
-                    self.appDelegate.activeMain.present(alertController, animated: true)
+                    self.appDelegate.window.rootViewController?.present(alertController, animated: true)
                     
                 case 409:
                     NCContentPresenter.shared.messageNotification("E2E get privateKey", description: "forbidden: the user can't access the private key", delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: errorCode)