normalize

iOSClient/Activity/NCActivity.swift

@@ -67,7 +67,8 @@ class NCActivity: UIViewController, NCEmptyDataSetDelegate {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        
+        appDelegate.activeViewController = self
+
         loadDataSource()
     }
     

iOSClient/AppDelegate.swift

@@ -54,7 +54,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     var activeShares: NCShares?
     var activeTransfers: NCTransfers?
     var activeTrash: NCTrash?
-    var activeViewController: UIViewController?
+    @objc var activeViewController: UIViewController?
     var activeViewerVideo: NCViewerVideo?
     
     var listFilesVC: [String:NCFiles] = [:]

iOSClient/FileViewInFolder/NCFileViewInFolder.swift

@@ -41,7 +41,8 @@ class NCFileViewInFolder: NCCollectionViewCommon  {
     }
     
     override func viewWillAppear(_ animated: Bool) {
-                
+        appDelegate.activeViewController = self
+        
         if serverUrl == NCUtilityFileSystem.shared.getHomeServer(urlBase: appDelegate.urlBase, account: appDelegate.account) {
             self.navigationItem.title = NCBrandOptions.shared.brand
         } else {
@@ -49,7 +50,6 @@ class NCFileViewInFolder: NCCollectionViewCommon  {
         }
         
         presentationController?.delegate = self
-        appDelegate.activeViewController = self
         
         (layout, sort, ascending, groupBy, directoryOnTop, titleButton, itemForLine) = NCUtility.shared.getLayoutForView(key: layoutKey, serverUrl: serverUrl)
         gridLayout.itemForLine = CGFloat(itemForLine)

iOSClient/Media/NCMedia.swift

@@ -118,6 +118,7 @@ class NCMedia: UIViewController, NCEmptyDataSetDelegate, NCSelectDelegate {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        appDelegate.activeViewController = self
         
         // hide nagigation controller
         navigationController?.navigationBar.prefersLargeTitles = true

iOSClient/More/NCMore.swift

@@ -72,6 +72,7 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        appDelegate.activeViewController = self
         
         var item = NCCommunicationExternalSite()
 

iOSClient/Notification/NCNotification.swift

@@ -51,6 +51,7 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        appDelegate.activeViewController = self
     }
     
     override func viewDidAppear(_ animated: Bool) {

iOSClient/Settings/CCAdvanced.m

@@ -260,6 +260,12 @@
     [self changeTheming];
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    appDelegate.activeViewController = self;
+}
+
 - (void)changeTheming
 {
     self.view.backgroundColor = NCBrandColor.shared.backgroundForm;

iOSClient/Settings/CCManageAccount.m

@@ -361,6 +361,12 @@
     [self changeTheming];
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    appDelegate.activeViewController = self;
+}
+
 - (void)changeTheming
 {
     self.view.backgroundColor = NCBrandColor.shared.backgroundForm;

iOSClient/Settings/CCManageAutoUpload.m

@@ -213,7 +213,8 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    
+    appDelegate.activeViewController = self;
+
     // Request permission for camera roll access
     [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) {
         switch (status) {

iOSClient/Settings/NCManageAutoUploadFileName.swift

@@ -41,6 +41,11 @@ class NCManageAutoUploadFileName: XLFormViewController {
         changeTheming()
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        appDelegate.activeViewController = self
+    }
+    
     func reloadForm() {
         
         self.form.delegate = nil

iOSClient/Settings/NCManageEndToEndEncryption.m

@@ -185,6 +185,12 @@
     [self changeTheming];
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    appDelegate.activeViewController = self;
+}
+
 - (void)changeTheming
 {
     self.view.backgroundColor = NCBrandColor.shared.backgroundForm;

iOSClient/Settings/NCSettings.m

@@ -189,6 +189,12 @@
     [self changeTheming];
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    appDelegate.activeViewController = self;
+}
+
 - (void)changeTheming
 {
     self.view.backgroundColor = NCBrandColor.shared.backgroundForm;

iOSClient/Trash/NCTrash.swift

@@ -95,6 +95,7 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        appDelegate.activeViewController = self
         
         self.navigationItem.title = titleCurrentFolder