1 year ago · f4c65b185c
--- a/Nextcloud.xcodeproj/project.pbxproj
+++ b/Nextcloud.xcodeproj/project.pbxproj
@@ -4991,7 +4991,7 @@
 
				 				CLANG_WARN_UNREACHABLE_CODE = YES;
			
 
				 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
			
 
				 				COPY_PHASE_STRIP = NO;
			
 
				-				CURRENT_PROJECT_VERSION = 9;
			
 
				+				CURRENT_PROJECT_VERSION = 0;
			
 
				 				DEBUG_INFORMATION_FORMAT = dwarf;
			
 
				 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
			
 
				 				ENABLE_STRICT_OBJC_MSGSEND = YES;
			
@@ -5017,7 +5017,7 @@
 
				 					"@executable_path/Frameworks",
			
 
				 					"@executable_path/../../Frameworks",
			
 
				 				);
			
 
				-				MARKETING_VERSION = 5.2.0;
			
 
				+				MARKETING_VERSION = 5.2.1;
			
 
				 				ONLY_ACTIVE_ARCH = YES;
			
 
				 				OTHER_LDFLAGS = "";
			
 
				 				SDKROOT = iphoneos;
			
@@ -5056,7 +5056,7 @@
 
				 				CLANG_WARN_UNREACHABLE_CODE = YES;
			
 
				 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
			
 
				 				COPY_PHASE_STRIP = NO;
			
 
				-				CURRENT_PROJECT_VERSION = 9;
			
 
				+				CURRENT_PROJECT_VERSION = 0;
			
 
				 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
			
 
				 				ENABLE_STRICT_OBJC_MSGSEND = YES;
			
 
				 				ENABLE_TESTABILITY = YES;
			
@@ -5079,7 +5079,7 @@
 
				 					"@executable_path/Frameworks",
			
 
				 					"@executable_path/../../Frameworks",
			
 
				 				);
			
 
				-				MARKETING_VERSION = 5.2.0;
			
 
				+				MARKETING_VERSION = 5.2.1;
			
 
				 				ONLY_ACTIVE_ARCH = YES;
			
 
				 				OTHER_LDFLAGS = "";
			
 
				 				SDKROOT = iphoneos;
			
@@ -5371,7 +5371,7 @@
 
				 			repositoryURL = "https://github.com/nextcloud/NextcloudKit";
			
 
				 			requirement = {
			
 
				 				kind = exactVersion;
			
 
				-				version = 2.9.7;
			
 
				+				version = 2.9.8;
			
 
				 			};
			
 
				 		};
			
 
				 		F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */ = {
			
--- a/Share/NCShareExtension+Files.swift
+++ b/Share/NCShareExtension+Files.swift
@@ -70,16 +70,14 @@ extension NCShareExtension {
 
				 
			
 
				     func loadFolder() {
			
 
				 
			
 
				-        networkInProgress = true
			
 
				-        collectionView.reloadData()
			
 
				-
			
 
				-        NCNetworking.shared.readFolder(serverUrl: serverUrl, account: activeAccount.account) { _, metadataFolder, _, _, _, error in
			
 
				-
			
 
				+        NCNetworking.shared.readFolder(serverUrl: serverUrl, account: activeAccount.account) { task in
			
 
				+            self.dataSourceTask = task
			
 
				+            self.collectionView.reloadData()
			
 
				+        } completion: { _, metadataFolder, _, _, _, error in
			
 
				             DispatchQueue.main.async {
			
 
				                 if error != .success {
			
 
				                     self.showAlert(description: error.errorDescription)
			
 
				                 }
			
 
				-                self.networkInProgress = false
			
 
				                 self.metadataFolder = metadataFolder
			
 
				                 self.reloadDatasource(withLoadFolder: false)
			
 
				             }
			
--- a/Share/NCShareExtension+NCDelegate.swift
+++ b/Share/NCShareExtension+NCDelegate.swift
@@ -29,7 +29,7 @@ extension NCShareExtension: NCEmptyDataSetDelegate, NCAccountRequestDelegate {
 
				 
			
 
				     func emptyDataSetView(_ view: NCEmptyView) {
			
 
				 
			
 
				-        if networkInProgress {
			
 
				+        if self.dataSourceTask?.state == .running {
			
 
				             view.emptyImage.image = UIImage(named: "networkInProgress")?.image(color: .gray, size: UIScreen.main.bounds.width)
			
 
				             view.emptyTitle.text = NSLocalizedString("_request_in_progress_", comment: "")
			
 
				             view.emptyDescription.text = ""
			
--- a/Share/NCShareExtension.swift
+++ b/Share/NCShareExtension.swift
@@ -57,7 +57,7 @@ class NCShareExtension: UIViewController {
 
				     var emptyDataSet: NCEmptyDataSet?
			
 
				     let keyLayout = NCGlobal.shared.layoutViewShareExtension
			
 
				     var metadataFolder: tableMetadata?
			
 
				-    var networkInProgress = false
			
 
				+    var dataSourceTask: URLSessionTask?
			
 
				     var dataSource = NCDataSource()
			
 
				     var layoutForView: NCDBLayoutForView?
			
 
				     let heightRowTableView: CGFloat = 50
			
--- a/iOSClient/AppDelegate.swift
+++ b/iOSClient/AppDelegate.swift
@@ -639,6 +639,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
				             NCPushNotification.shared().unsubscribingNextcloudServerPushNotification(account.account, urlBase: account.urlBase, user: account.user, withSubscribing: false)
			
 
				         }
			
 
				 
			
 
				+        NextcloudKit.shared.deleteAppPassword(serverUrl: urlBase, username: userId, password: password) { _, error in
			
 
				+            print(error)
			
 
				+        }
			
 
				+
			
 
				         let results = NCManageDatabase.shared.getTableLocalFiles(predicate: NSPredicate(format: "account == %@", account), sorted: "ocId", ascending: false)
			
 
				         let utilityFileSystem = NCUtilityFileSystem()
			
 
				         for result in results {
			
--- a/iOSClient/Favorites/NCFavorite.swift
+++ b/iOSClient/Favorites/NCFavorite.swift
@@ -76,9 +76,10 @@ class NCFavorite: NCCollectionViewCommon {
 
				     override func reloadDataSourceNetwork() {
			
 
				         super.reloadDataSourceNetwork()
			
 
				 
			
 
				-        NextcloudKit.shared.listingFavorites(showHiddenFiles: NCKeychain().showHiddenFiles,
			
 
				-                                             options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { account, files, _, error in
			
 
				-
			
 
				+        NextcloudKit.shared.listingFavorites(showHiddenFiles: NCKeychain().showHiddenFiles, options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { task in
			
 
				+            self.dataSourceTask = task
			
 
				+            self.collectionView.reloadData()
			
 
				+        } completion: { account, files, _, error in
			
 
				             if error == .success {
			
 
				                 NCManageDatabase.shared.convertFilesToMetadatas(files, useMetadataFolder: false) { _, _, metadatas in
			
 
				                     NCManageDatabase.shared.updateMetadatasFavorite(account: account, metadatas: metadatas)
			
--- a/iOSClient/Files/NCFiles.swift
+++ b/iOSClient/Files/NCFiles.swift
@@ -180,8 +180,10 @@ class NCFiles: NCCollectionViewCommon {
 
				 
			
 
				         var tableDirectory: tableDirectory?
			
 
				 
			
 
				-        NCNetworking.shared.readFile(serverUrlFileName: serverUrl) { account, metadataFolder, error in
			
 
				-
			
 
				+        NCNetworking.shared.readFile(serverUrlFileName: serverUrl) { task in
			
 
				+            self.dataSourceTask = task
			
 
				+            self.collectionView.reloadData()
			
 
				+        } completion: { account, metadataFolder, error in
			
 
				             guard error == .success, let metadataFolder else {
			
 
				                 return completion(nil, nil, 0, false, error)
			
 
				             }
			
@@ -193,7 +195,10 @@ class NCFiles: NCCollectionViewCommon {
 
				             if tableDirectory?.etag != metadataFolder.etag || metadataFolder.e2eEncrypted {
			
 
				                 NCNetworking.shared.readFolder(serverUrl: self.serverUrl,
			
 
				                                                account: self.appDelegate.account,
			
 
				-                                               forceReplaceMetadatas: forceReplaceMetadatas) { _, metadataFolder, metadatas, metadatasChangedCount, metadatasChanged, error in
			
 
				+                                               forceReplaceMetadatas: forceReplaceMetadatas) { task in
			
 
				+                    self.dataSourceTask = task
			
 
				+                    self.collectionView.reloadData()
			
 
				+                } completion: { _, metadataFolder, metadatas, metadatasChangedCount, metadatasChanged, error in
			
 
				                     guard error == .success else {
			
 
				                         return completion(tableDirectory, nil, 0, false, error)
			
 
				                     }
			
--- a/iOSClient/Groupfolders/NCGroupfolders.swift
+++ b/iOSClient/Groupfolders/NCGroupfolders.swift
@@ -79,8 +79,10 @@ class NCGroupfolders: NCCollectionViewCommon {
 
				 
			
 
				         let homeServerUrl = utilityFileSystem.getHomeServer(urlBase: self.appDelegate.urlBase, userId: self.appDelegate.userId)
			
 
				 
			
 
				-        NextcloudKit.shared.getGroupfolders(options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { account, results, _, error in
			
 
				-
			
 
				+        NextcloudKit.shared.getGroupfolders(options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { task in
			
 
				+            self.dataSourceTask = task
			
 
				+            self.collectionView.reloadData()
			
 
				+        } completion: { account, results, _, error in
			
 
				             if error == .success, let groupfolders = results {
			
 
				                 NCManageDatabase.shared.addGroupfolders(account: account, groupfolders: groupfolders)
			
 
				                 Task {
			
--- a/Common/NCCollectionViewCommon.swift
+++ b/Common/NCCollectionViewCommon.swift
@@ -57,20 +57,13 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
				     var isSearchingMode: Bool = false
			
 
				     var layoutForView: NCDBLayoutForView?
			
 
				     var selectableDataSource: [RealmSwiftObject] { dataSource.getMetadataSourceForAllSections() }
			
 
				-
			
 
				+    var dataSourceTask: URLSessionTask?
			
 
				     var groupByField = "name"
			
 
				     var providers: [NKSearchProvider]?
			
 
				     var searchResults: [NKSearchResult]?
			
 
				     var listLayout: NCListLayout!
			
 
				     var gridLayout: NCGridLayout!
			
 
				     var literalSearch: String?
			
 
				-    var isReloadDataSourceNetworkInProgress: Bool = false {
			
 
				-        didSet {
			
 
				-            DispatchQueue.main.async {
			
 
				-                self.setNavigationRightItems(enableMoreMenu: !self.isReloadDataSourceNetworkInProgress)
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				     var tabBarSelect: NCSelectableViewTabBar?
			
 
				 
			
 
				     var timerNotificationCenter: Timer?
			
@@ -229,14 +222,14 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
				         navigationController?.navigationBar.prefersLargeTitles = true
			
 
				         navigationController?.setNavigationBarHidden(false, animated: true)
			
 
				         navigationController?.setNavigationBarAppearance()
			
 
				+
			
 
				         setNavigationLeftItems()
			
 
				+        setNavigationRightItems()
			
 
				 
			
 
				         // FIXME: iPAD PDF landscape mode iOS 16
			
 
				         DispatchQueue.main.async {
			
 
				             self.collectionView?.collectionViewLayout.invalidateLayout()
			
 
				         }
			
 
				-
			
 
				-        setNavigationRightItems(enableMoreMenu: false)
			
 
				     }
			
 
				 
			
 
				     override func viewWillDisappear(_ animated: Bool) {
			
@@ -696,13 +689,13 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
				         self.emptyDataSet?.setOffset(getHeaderHeight())
			
 
				         if isSearchingMode {
			
 
				             view.emptyImage.image = UIImage(named: "search")?.image(color: .gray, size: UIScreen.main.bounds.width)
			
 
				-            if isReloadDataSourceNetworkInProgress {
			
 
				+            if self.dataSourceTask?.state == .running {
			
 
				                 view.emptyTitle.text = NSLocalizedString("_search_in_progress_", comment: "")
			
 
				             } else {
			
 
				                 view.emptyTitle.text = NSLocalizedString("_search_no_record_found_", comment: "")
			
 
				             }
			
 
				             view.emptyDescription.text = NSLocalizedString("_search_instruction_", comment: "")
			
 
				-        } else if isReloadDataSourceNetworkInProgress {
			
 
				+        } else if self.dataSourceTask?.state == .running {
			
 
				             view.emptyImage.image = UIImage(named: "networkInProgress")?.image(color: .gray, size: UIScreen.main.bounds.width)
			
 
				             view.emptyTitle.text = NSLocalizedString("_request_in_progress_", comment: "")
			
 
				             view.emptyDescription.text = ""
			
@@ -910,17 +903,16 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
				 
			
 
				         DispatchQueue.global().async {
			
 
				             if withQueryDB { self.queryDB() }
			
 
				-            self.isReloadDataSourceNetworkInProgress = false
			
 
				             DispatchQueue.main.async {
			
 
				                 self.refreshControl.endRefreshing()
			
 
				                 self.collectionView.reloadData()
			
 
				+                self.setNavigationRightItems()
			
 
				             }
			
 
				         }
			
 
				     }
			
 
				 
			
 
				     @objc func reloadDataSourceNetwork() {
			
 
				         DispatchQueue.main.async {
			
 
				-            self.isReloadDataSourceNetworkInProgress = true
			
 
				             self.collectionView?.reloadData()
			
 
				         }
			
 
				     }
			
@@ -929,13 +921,15 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
				         guard !appDelegate.account.isEmpty, let literalSearch = literalSearch, !literalSearch.isEmpty
			
 
				         else { return self.refreshControl.endRefreshing() }
			
 
				 
			
 
				-        isReloadDataSourceNetworkInProgress = true
			
 
				         self.dataSource.clearDataSource()
			
 
				         self.refreshControl.beginRefreshing()
			
 
				         self.collectionView.reloadData()
			
 
				 
			
 
				         if NCGlobal.shared.capabilityServerVersionMajor >= NCGlobal.shared.nextcloudVersion20 {
			
 
				-            NCNetworking.shared.unifiedSearchFiles(userBaseUrl: appDelegate, literal: literalSearch) { _, searchProviders in
			
 
				+            NCNetworking.shared.unifiedSearchFiles(userBaseUrl: appDelegate, literal: literalSearch) { task in
			
 
				+                self.dataSourceTask = task
			
 
				+                self.collectionView.reloadData()
			
 
				+            } providers: { _, searchProviders in
			
 
				                 self.providers = searchProviders
			
 
				                 self.searchResults = []
			
 
				                 self.dataSource = NCDataSource(
			
@@ -952,11 +946,13 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
				                 NCNetworking.shared.unifiedSearchQueue.addOperation(NCOperationUnifiedSearch(collectionViewCommon: self, metadatas: metadatas, searchResult: searchResult))
			
 
				             } completion: { _, _ in
			
 
				                 self.refreshControl.endRefreshing()
			
 
				-                self.isReloadDataSourceNetworkInProgress = false
			
 
				                 self.collectionView.reloadData()
			
 
				             }
			
 
				         } else {
			
 
				-            NCNetworking.shared.searchFiles(urlBase: appDelegate, literal: literalSearch) { metadatas, error in
			
 
				+            NCNetworking.shared.searchFiles(urlBase: appDelegate, literal: literalSearch) { task in
			
 
				+                self.dataSourceTask = task
			
 
				+                self.collectionView.reloadData()
			
 
				+            } completion: { metadatas, error in
			
 
				                 DispatchQueue.main.async {
			
 
				                     self.refreshControl.endRefreshing()
			
 
				                     self.collectionView.reloadData()
			
@@ -972,7 +968,6 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
				                     groupByField: self.groupByField,
			
 
				                     providers: self.providers,
			
 
				                     searchResults: self.searchResults)
			
 
				-                self.isReloadDataSourceNetworkInProgress = false
			
 
				             }
			
 
				         }
			
 
				     }
			
@@ -984,7 +979,10 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
				         metadataForSection.unifiedSearchInProgress = true
			
 
				         self.collectionView?.reloadData()
			
 
				 
			
 
				-        NCNetworking.shared.unifiedSearchFilesProvider(userBaseUrl: appDelegate, id: lastSearchResult.id, term: term, limit: 5, cursor: cursor) { _, searchResult, metadatas, error in
			
 
				+        NCNetworking.shared.unifiedSearchFilesProvider(userBaseUrl: appDelegate, id: lastSearchResult.id, term: term, limit: 5, cursor: cursor) { task in
			
 
				+            self.dataSourceTask = task
			
 
				+            self.collectionView.reloadData()
			
 
				+        } completion: { _, searchResult, metadatas, error in
			
 
				             if error != .success {
			
 
				                 NCContentPresenter().showError(error: error)
			
 
				             }
			
@@ -1661,7 +1659,7 @@ extension NCCollectionViewCommon: EasyTipViewDelegate {
 
				 }
			
 
				 
			
 
				 extension NCCollectionViewCommon: NCSelectableNavigationView, NCCollectionViewCommonSelectTabBarDelegate {
			
 
				-    func setNavigationRightItems(enableMoreMenu: Bool = true) {
			
 
				+    func setNavigationRightItems(enableMenu: Bool = false) {
			
 
				         var selectedMetadatas: [tableMetadata] = []
			
 
				         var isAnyOffline = false
			
 
				         var isAnyDirectory = false
			
@@ -1715,24 +1713,20 @@ extension NCCollectionViewCommon: NCSelectableNavigationView, NCCollectionViewCo
 
				 
			
 
				         if isEditMode {
			
 
				             tabBarSelect.show()
			
 
				-
			
 
				             let select = UIBarButtonItem(title: NSLocalizedString("_cancel_", comment: ""), style: .done) { self.toggleSelect() }
			
 
				-
			
 
				             navigationItem.rightBarButtonItems = [select]
			
 
				         } else {
			
 
				             tabBarSelect.hide()
			
 
				-
			
 
				-            let notification = UIBarButtonItem(image: .init(systemName: "bell"), style: .plain, action: tapNotification)
			
 
				-
			
 
				-            let menu = UIMenu(children: createMenuActions())
			
 
				-            let menuButton = UIBarButtonItem(image: .init(systemName: "ellipsis.circle"), menu: menu)
			
 
				-
			
 
				-            menuButton.isEnabled = enableMoreMenu
			
 
				-
			
 
				-            if layoutKey == NCGlobal.shared.layoutViewFiles {
			
 
				-                navigationItem.rightBarButtonItems = [menuButton, notification]
			
 
				+            if navigationItem.rightBarButtonItems == nil || enableMenu {
			
 
				+                let menuButton = UIBarButtonItem(image: .init(systemName: "ellipsis.circle"), menu: UIMenu(children: createMenuActions()))
			
 
				+                if layoutKey == NCGlobal.shared.layoutViewFiles {
			
 
				+                    let notification = UIBarButtonItem(image: .init(systemName: "bell"), style: .plain, action: tapNotification)
			
 
				+                    navigationItem.rightBarButtonItems = [menuButton, notification]
			
 
				+                } else {
			
 
				+                    navigationItem.rightBarButtonItems = [menuButton]
			
 
				+                }
			
 
				             } else {
			
 
				-                navigationItem.rightBarButtonItems = [menuButton]
			
 
				+                navigationItem.rightBarButtonItems?.first?.menu = navigationItem.rightBarButtonItems?.first?.menu?.replacingChildren(createMenuActions())
			
 
				             }
			
 
				         }
			
 
				     }
			
--- a/Common/NCCollectionViewCommonSelectTabBar.swift
+++ b/Common/NCCollectionViewCommonSelectTabBar.swift
@@ -43,7 +43,6 @@ class NCCollectionViewCommonSelectTabBar: NCSelectableViewTabBar, ObservableObje
 
				 
			
 
				         guard let tabBarController, let hostingController else { return }
			
 
				 
			
 
				-        
			
 
				         tabBarController.view.addSubview(hostingController.view)
			
 
				 
			
 
				         hostingController.view.frame = tabBarController.tabBar.frame
			
--- a/Common/NCSelectableNavigationView.swift
+++ b/Common/NCSelectableNavigationView.swift
@@ -55,7 +55,7 @@ protocol NCSelectableNavigationView: AnyObject {
 
				 
			
 
				     func reloadDataSource(withQueryDB: Bool)
			
 
				     func setNavigationLeftItems()
			
 
				-    func setNavigationRightItems(enableMoreMenu: Bool)
			
 
				+    func setNavigationRightItems(enableMenu: Bool)
			
 
				     func createMenuActions() -> [UIMenuElement]
			
 
				 
			
 
				     func toggleSelect(isOn: Bool?)
			
@@ -70,7 +70,7 @@ extension NCSelectableNavigationView {
 
				         NCManageDatabase.shared.setLayoutForView(layoutForView: layoutForView)
			
 
				         NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadDataSource)
			
 
				 
			
 
				-        setNavigationRightItems(enableMoreMenu: true)
			
 
				+        setNavigationRightItems(enableMenu: false)
			
 
				     }
			
 
				 
			
 
				     /// If explicit `isOn` is not set, it will invert `isEditMode`
			
@@ -80,7 +80,7 @@ extension NCSelectableNavigationView {
 
				             self.selectOcId.removeAll()
			
 
				             self.selectIndexPath.removeAll()
			
 
				             self.setNavigationLeftItems()
			
 
				-            self.setNavigationRightItems(enableMoreMenu: true)
			
 
				+            self.setNavigationRightItems(enableMenu: true)
			
 
				             self.collectionView.reloadData()
			
 
				         }
			
 
				     }
			
@@ -88,7 +88,7 @@ extension NCSelectableNavigationView {
 
				     func collectionViewSelectAll() {
			
 
				         selectOcId = selectableDataSource.compactMap({ $0.primaryKeyValue })
			
 
				         collectionView.reloadData()
			
 
				-        setNavigationRightItems(enableMoreMenu: true)
			
 
				+        setNavigationRightItems(enableMenu: false)
			
 
				     }
			
 
				 
			
 
				     func tapNotification() {
			
--- a/iOSClient/Networking/NCNetworking+WebDAV.swift
+++ b/iOSClient/Networking/NCNetworking+WebDAV.swift
@@ -35,13 +35,16 @@ extension NCNetworking {
 
				     func readFolder(serverUrl: String,
			
 
				                     account: String,
			
 
				                     forceReplaceMetadatas: Bool = false,
			
 
				+                    taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
			
 
				                     completion: @escaping (_ account: String, _ metadataFolder: tableMetadata?, _ metadatas: [tableMetadata]?, _ metadatasChangedCount: Int, _ metadatasChanged: Bool, _ error: NKError) -> Void) {
			
 
				 
			
 
				         NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrl,
			
 
				                                              depth: "1",
			
 
				                                              showHiddenFiles: NCKeychain().showHiddenFiles,
			
 
				                                              includeHiddenFiles: NCGlobal.shared.includeHiddenFiles,
			
 
				-                                             options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { account, files, _, error in
			
 
				+                                             options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { task in
			
 
				+            taskHandler(task)
			
 
				+        } completion: { account, files, _, error in
			
 
				 
			
 
				             guard error == .success else {
			
 
				                 return completion(account, nil, nil, 0, false, error)
			
@@ -86,11 +89,14 @@ extension NCNetworking {
 
				     func readFile(serverUrlFileName: String,
			
 
				                   showHiddenFiles: Bool = NCKeychain().showHiddenFiles,
			
 
				                   queue: DispatchQueue = NextcloudKit.shared.nkCommonInstance.backgroundQueue,
			
 
				+                  taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
			
 
				                   completion: @escaping (_ account: String, _ metadata: tableMetadata?, _ error: NKError) -> Void) {
			
 
				 
			
 
				         let options = NKRequestOptions(queue: queue)
			
 
				 
			
 
				-        NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: "0", showHiddenFiles: showHiddenFiles, options: options) { account, files, _, error in
			
 
				+        NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: "0", showHiddenFiles: showHiddenFiles, options: options) { task in
			
 
				+            taskHandler(task)
			
 
				+        } completion: { account, files, _, error in
			
 
				             guard error == .success, files.count == 1, let file = files.first else {
			
 
				                 completion(account, nil, error)
			
 
				                 return
			
@@ -731,13 +737,16 @@ extension NCNetworking {
 
				     /// WebDAV search
			
 
				     func searchFiles(urlBase: NCUserBaseUrl,
			
 
				                      literal: String,
			
 
				+                     taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
			
 
				                      completion: @escaping (_ metadatas: [tableMetadata]?, _ error: NKError) -> Void) {
			
 
				 
			
 
				         NextcloudKit.shared.searchLiteral(serverUrl: urlBase.urlBase,
			
 
				                                           depth: "infinity",
			
 
				                                           literal: literal,
			
 
				                                           showHiddenFiles: NCKeychain().showHiddenFiles,
			
 
				-                                          options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { account, files, _, error in
			
 
				+                                          options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { task in
			
 
				+            taskHandler(task)
			
 
				+        } completion: { account, files, _, error in
			
 
				 
			
 
				             guard error == .success else {
			
 
				                 return completion(nil, error)
			
@@ -762,6 +771,7 @@ extension NCNetworking {
 
				     ///
			
 
				     func unifiedSearchFiles(userBaseUrl: NCUserBaseUrl,
			
 
				                             literal: String,
			
 
				+                            taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
			
 
				                             providers: @escaping (_ accout: String, _ searchProviders: [NKSearchProvider]?) -> Void,
			
 
				                             update: @escaping (_ account: String, _ id: String, NKSearchResult?, [tableMetadata]?) -> Void,
			
 
				                             completion: @escaping (_ account: String, _ error: NKError) -> Void) {
			
@@ -780,6 +790,8 @@ extension NCNetworking {
 
				             if let request = request {
			
 
				                 self.requestsUnifiedSearch.append(request)
			
 
				             }
			
 
				+        } taskHandler: { task in
			
 
				+            taskHandler(task)
			
 
				         } providers: { account, searchProviders in
			
 
				             providers(account, searchProviders)
			
 
				         } update: { account, partialResult, provider, _ in
			
@@ -838,11 +850,14 @@ extension NCNetworking {
 
				     func unifiedSearchFilesProvider(userBaseUrl: NCUserBaseUrl,
			
 
				                                     id: String, term: String,
			
 
				                                     limit: Int, cursor: Int,
			
 
				+                                    taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
			
 
				                                     completion: @escaping (_ account: String, _ searchResult: NKSearchResult?, _ metadatas: [tableMetadata]?, _ error: NKError) -> Void) {
			
 
				 
			
 
				         var metadatas: [tableMetadata] = []
			
 
				 
			
 
				-        let request = NextcloudKit.shared.searchProvider(id, account: userBaseUrl.account, term: term, limit: limit, cursor: cursor, timeout: 60) { account, searchResult, _, error in
			
 
				+        let request = NextcloudKit.shared.searchProvider(id, account: userBaseUrl.account, term: term, limit: limit, cursor: cursor, timeout: 60) { task in
			
 
				+            taskHandler(task)
			
 
				+        } completion: { account, searchResult, _, error in
			
 
				             guard let searchResult = searchResult else {
			
 
				                 completion(account, nil, metadatas, error)
			
 
				                 return
			
--- a/iOSClient/Notification/NCNotification.swift
+++ b/iOSClient/Notification/NCNotification.swift
@@ -34,7 +34,7 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
 
				     let utility = NCUtility()
			
 
				     var notifications: [NKNotifications] = []
			
 
				     var emptyDataSet: NCEmptyDataSet?
			
 
				-    var isReloadDataSourceNetworkInProgress: Bool = false
			
 
				+    var dataSourceTask: URLSessionTask?
			
 
				 
			
 
				     // MARK: - View Life Cycle
			
 
				 
			
@@ -79,7 +79,7 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
 
				 
			
 
				     func emptyDataSetView(_ view: NCEmptyView) {
			
 
				 
			
 
				-        if isReloadDataSourceNetworkInProgress {
			
 
				+        if self.dataSourceTask?.state == .running {
			
 
				             view.emptyImage.image = UIImage(named: "networkInProgress")?.image(color: .gray, size: UIScreen.main.bounds.width)
			
 
				             view.emptyTitle.text = NSLocalizedString("_request_in_progress_", comment: "")
			
 
				             view.emptyDescription.text = ""
			
@@ -302,26 +302,26 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
 
				 
			
 
				    @objc func getNetwokingNotification() {
			
 
				 
			
 
				-        isReloadDataSourceNetworkInProgress = true
			
 
				-        self.tableView.reloadData()
			
 
				-
			
 
				-        NextcloudKit.shared.getNotifications { account, notifications, _, error in
			
 
				-            if error == .success && account == self.appDelegate.account {
			
 
				-                self.notifications.removeAll()
			
 
				-                let sortedListOfNotifications = (notifications! as NSArray).sortedArray(using: [NSSortDescriptor(key: "date", ascending: false)])
			
 
				-                for notification in sortedListOfNotifications {
			
 
				-                    if let icon = (notification as? NKNotifications)?.icon {
			
 
				-                        self.utility.convertSVGtoPNGWriteToUserData(svgUrlString: icon, fileName: nil, width: 25, rewrite: false, account: self.appDelegate.account, completion: { _, _ in })
			
 
				-                    }
			
 
				-                    if let notification = (notification as? NKNotifications) {
			
 
				-                        self.notifications.append(notification)
			
 
				-                    }
			
 
				-                }
			
 
				-                self.refreshControl?.endRefreshing()
			
 
				-                self.isReloadDataSourceNetworkInProgress = false
			
 
				-                self.tableView.reloadData()
			
 
				-            }
			
 
				-        }
			
 
				+       self.tableView.reloadData()
			
 
				+       NextcloudKit.shared.getNotifications { task in
			
 
				+           self.dataSourceTask = task
			
 
				+           self.tableView.reloadData()
			
 
				+       } completion: { account, notifications, _, error in
			
 
				+           if error == .success && account == self.appDelegate.account {
			
 
				+               self.notifications.removeAll()
			
 
				+               let sortedListOfNotifications = (notifications! as NSArray).sortedArray(using: [NSSortDescriptor(key: "date", ascending: false)])
			
 
				+               for notification in sortedListOfNotifications {
			
 
				+                   if let icon = (notification as? NKNotifications)?.icon {
			
 
				+                       self.utility.convertSVGtoPNGWriteToUserData(svgUrlString: icon, fileName: nil, width: 25, rewrite: false, account: self.appDelegate.account, completion: { _, _ in })
			
 
				+                   }
			
 
				+                   if let notification = (notification as? NKNotifications) {
			
 
				+                       self.notifications.append(notification)
			
 
				+                   }
			
 
				+               }
			
 
				+               self.refreshControl?.endRefreshing()
			
 
				+               self.tableView.reloadData()
			
 
				+           }
			
 
				+       }
			
 
				     }
			
 
				 }
			
 
				 
			
--- a/iOSClient/Offline/NCOffline.swift
+++ b/iOSClient/Offline/NCOffline.swift
@@ -83,7 +83,6 @@ class NCOffline: NCCollectionViewCommon {
 
				 
			
 
				     override func reloadDataSourceNetwork() {
			
 
				         super.reloadDataSourceNetwork()
			
 
				-
			
 
				         reloadDataSource()
			
 
				     }
			
 
				 }
			
--- a/iOSClient/PushNotification/NCPushNotification.m
+++ b/iOSClient/PushNotification/NCPushNotification.m
@@ -107,12 +107,14 @@
 
				     NSString *proxyServerPath = [NCBrandOptions shared].pushNotificationServerProxy;
			
 
				     NKRequestOptions *options = [[NKRequestOptions alloc] initWithEndpoint:nil version:nil customHeader:nil customUserAgent:nil contentType:nil e2eToken:nil timeout:60 queue:dispatch_get_main_queue()];
			
 
				 
			
 
				-    [[NextcloudKit shared] subscribingPushNotificationWithServerUrl:urlBase account:account user:user password:[[[NCKeychain alloc] init] getPasswordWithAccount:account] pushTokenHash:pushTokenHash devicePublicKey:pushDevicePublicKey proxyServerUrl:proxyServerPath options:options completion:^(NSString *account, NSString *deviceIdentifier, NSString *signature, NSString *publicKey, NSData *data, NKError *error) {
			
 
				+    [[NextcloudKit shared] subscribingPushNotificationWithServerUrl:urlBase account:account user:user password:[[[NCKeychain alloc] init] getPasswordWithAccount:account] pushTokenHash:pushTokenHash devicePublicKey:pushDevicePublicKey proxyServerUrl:proxyServerPath options:options taskHandler:^(NSURLSessionTask *task) {
			
 
				+    } completion:^(NSString *account, NSString *deviceIdentifier, NSString *signature, NSString *publicKey, NSData *data, NKError *error) {
			
 
				         if (error == NKError.success) {
			
 
				             NSString *userAgent = [NSString stringWithFormat:@"%@  (Strict VoIP)", [[NCBrandOptions shared] getUserAgent]];
			
 
				             NKRequestOptions *options = [[NKRequestOptions alloc] initWithEndpoint:nil version:nil customHeader:nil customUserAgent:userAgent contentType:nil e2eToken:nil timeout:60 queue:dispatch_get_main_queue()];
			
 
				 
			
 
				-            [[NextcloudKit shared] subscribingPushProxyWithProxyServerUrl:proxyServerPath pushToken:self.pushKitToken deviceIdentifier:deviceIdentifier signature:signature publicKey:publicKey options:options completion:^(NKError *error) {
			
 
				+            [[NextcloudKit shared] subscribingPushProxyWithProxyServerUrl:proxyServerPath pushToken:self.pushKitToken deviceIdentifier:deviceIdentifier signature:signature publicKey:publicKey options:options taskHandler:^(NSURLSessionTask *task) {
			
 
				+            } completion:^(NKError *error) {
			
 
				                 if (error == NKError.success) {
			
 
				 
			
 
				                     [[[NextcloudKit shared] nkCommonInstance] writeLog:@"[INFO] Subscribed to Push Notification server & proxy successfully"];
			
@@ -136,13 +138,15 @@
 
				     NSString *publicKey = [[[NCKeychain alloc] init] getPushNotificationSubscribingPublicKeyWithAccount:account];
			
 
				     NKRequestOptions *options = [[NKRequestOptions alloc] initWithEndpoint:nil version:nil customHeader:nil customUserAgent:nil contentType:nil e2eToken:nil timeout:60 queue:dispatch_get_main_queue()];
			
 
				 
			
 
				-    [[NextcloudKit shared] unsubscribingPushNotificationWithServerUrl:urlBase account:account user:user password:[[[NCKeychain alloc] init] getPasswordWithAccount:account] options:options completion:^(NSString *account, NKError *error) {
			
 
				+    [[NextcloudKit shared] unsubscribingPushNotificationWithServerUrl:urlBase account:account user:user password:[[[NCKeychain alloc] init] getPasswordWithAccount:account] options:options taskHandler:^(NSURLSessionTask *task) {
			
 
				+    } completion:^(NSString *account, NKError *error) {
			
 
				         if (error == NKError.success) {
			
 
				             NSString *proxyServerPath = [NCBrandOptions shared].pushNotificationServerProxy;
			
 
				             NSString *userAgent = [NSString stringWithFormat:@"%@  (Strict VoIP)", [[NCBrandOptions shared] getUserAgent]];
			
 
				             NKRequestOptions *options = [[NKRequestOptions alloc] initWithEndpoint:nil version:nil customHeader:nil customUserAgent:userAgent contentType:nil e2eToken:nil timeout:60 queue:dispatch_get_main_queue()];
			
 
				 
			
 
				-            [[NextcloudKit shared] unsubscribingPushProxyWithProxyServerUrl:proxyServerPath deviceIdentifier:deviceIdentifier signature:signature publicKey:publicKey options:options completion:^(NKError *error) {
			
 
				+            [[NextcloudKit shared] unsubscribingPushProxyWithProxyServerUrl:proxyServerPath deviceIdentifier:deviceIdentifier signature:signature publicKey:publicKey options:options taskHandler:^(NSURLSessionTask *task) {
			
 
				+            } completion:^(NKError *error) {
			
 
				                 if (error == NKError.success) {
			
 
				                 
			
 
				                     [[[NextcloudKit shared] nkCommonInstance] writeLog:@"[INFO] Unsubscribed to Push Notification server & proxy successfully."];
			
--- a/iOSClient/Recent/NCRecent.swift
+++ b/iOSClient/Recent/NCRecent.swift
@@ -135,8 +135,10 @@ class NCRecent: NCCollectionViewCommon {
 
				         NextcloudKit.shared.searchBodyRequest(serverUrl: appDelegate.urlBase,
			
 
				                                               requestBody: requestBody,
			
 
				                                               showHiddenFiles: NCKeychain().showHiddenFiles,
			
 
				-                                              options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { account, files, _, error in
			
 
				-
			
 
				+                                              options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { task in
			
 
				+            self.dataSourceTask = task
			
 
				+            self.collectionView.reloadData()
			
 
				+        } completion: { account, files, _, error in
			
 
				             if error == .success {
			
 
				                 NCManageDatabase.shared.convertFilesToMetadatas(files, useMetadataFolder: false) { _, metadatasFolder, metadatas in
			
 
				                     // Update sub directories
			
--- a/iOSClient/RichWorkspace/NCViewerRichWorkspace.swift
+++ b/iOSClient/RichWorkspace/NCViewerRichWorkspace.swift
@@ -62,7 +62,8 @@ import MarkdownKit
 
				         super.viewWillAppear(animated)
			
 
				 
			
 
				         DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
			
 
				-            NCNetworking.shared.readFile(serverUrlFileName: self.serverUrl, queue: .main) { account, metadata, error in
			
 
				+            NCNetworking.shared.readFile(serverUrlFileName: self.serverUrl, queue: .main) { _ in
			
 
				+            } completion: { account, metadata, error in
			
 
				                 if error == .success, account == self.appDelegate.account, let metadata {
			
 
				                     NCManageDatabase.shared.setDirectory(serverUrl: self.serverUrl, richWorkspace: metadata.richWorkspace, account: account)
			
 
				                     if self.richWorkspaceText != metadata.richWorkspace, metadata.richWorkspace != nil {
			
--- a/iOSClient/Select/NCSelect.swift
+++ b/iOSClient/Select/NCSelect.swift
@@ -62,24 +62,17 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
 
				     var serverUrl = ""
			
 
				     // -------------------------------------------------------------
			
 
				 
			
 
				+    private var dataSourceTask: URLSessionTask?
			
 
				     private var emptyDataSet: NCEmptyDataSet?
			
 
				-
			
 
				     private var serverUrlPush = ""
			
 
				     private var metadataFolder = tableMetadata()
			
 
				-
			
 
				-    private var networkInProgress = false
			
 
				     private var overwrite = true
			
 
				-
			
 
				     private var dataSource = NCDataSource()
			
 
				     internal var richWorkspaceText: String?
			
 
				-
			
 
				     internal var headerMenu: NCSectionHeaderMenu?
			
 
				-
			
 
				     private var autoUploadFileName = ""
			
 
				     private var autoUploadDirectory = ""
			
 
				-
			
 
				     private var backgroundImageView = UIImageView()
			
 
				-
			
 
				     private var activeAccount: tableAccount!
			
 
				     private let window = UIApplication.shared.connectedScenes.flatMap { ($0 as? UIWindowScene)?.windows ?? [] }.first { $0.isKeyWindow }
			
 
				 
			
@@ -202,7 +195,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
 
				 
			
 
				     func emptyDataSetView(_ view: NCEmptyView) {
			
 
				 
			
 
				-        if networkInProgress {
			
 
				+        if self.dataSourceTask?.state == .running {
			
 
				             view.emptyImage.image = UIImage(named: "networkInProgress")?.image(color: .gray, size: UIScreen.main.bounds.width)
			
 
				             view.emptyTitle.text = NSLocalizedString("_request_in_progress_", comment: "")
			
 
				             view.emptyDescription.text = ""
			
@@ -561,14 +554,13 @@ extension NCSelect {
 
				 
			
 
				     func loadFolder() {
			
 
				 
			
 
				-        networkInProgress = true
			
 
				-        collectionView.reloadData()
			
 
				-
			
 
				-        NCNetworking.shared.readFolder(serverUrl: serverUrl, account: activeAccount.account) { _, _, _, _, _, error in
			
 
				+        NCNetworking.shared.readFolder(serverUrl: serverUrl, account: activeAccount.account) { task in
			
 
				+            self.dataSourceTask = task
			
 
				+            self.collectionView.reloadData()
			
 
				+        } completion: { _, _, _, _, _, error in
			
 
				             if error != .success {
			
 
				                 NCContentPresenter().showError(error: error)
			
 
				             }
			
 
				-            self.networkInProgress = false
			
 
				             self.loadDatasource(withLoadFolder: false)
			
 
				         }
			
 
				     }
			
--- a/iOSClient/Shares/NCShares.swift
+++ b/iOSClient/Shares/NCShares.swift
@@ -80,7 +80,10 @@ class NCShares: NCCollectionViewCommon {
 
				                 }
			
 
				             } else {
			
 
				                 let serverUrlFileName = share.serverUrl + "/" + share.fileName
			
 
				-                NCNetworking.shared.readFile(serverUrlFileName: serverUrlFileName) { _, metadata, _ in
			
 
				+                NCNetworking.shared.readFile(serverUrlFileName: serverUrlFileName) { task in
			
 
				+                    self.dataSourceTask = task
			
 
				+                    self.collectionView.reloadData()
			
 
				+                } completion: { _, metadata, _ in
			
 
				                     if let metadata {
			
 
				                         NCManageDatabase.shared.addMetadata(metadata)
			
 
				                         if !(metadatas.contains { $0.ocId == metadata.ocId }) {
			
@@ -98,8 +101,10 @@ class NCShares: NCCollectionViewCommon {
 
				     override func reloadDataSourceNetwork() {
			
 
				         super.reloadDataSourceNetwork()
			
 
				 
			
 
				-        NextcloudKit.shared.readShares(parameters: NKShareParameter()) { account, shares, _, error in
			
 
				-
			
 
				+        NextcloudKit.shared.readShares(parameters: NKShareParameter()) { task in
			
 
				+            self.dataSourceTask = task
			
 
				+            self.collectionView.reloadData()
			
 
				+        } completion: { account, shares, _, error in
			
 
				             if error == .success {
			
 
				                 NCManageDatabase.shared.deleteTableShare(account: account)
			
 
				                 if let shares = shares, !shares.isEmpty {
			
--- a/Files/pt-BR.lproj/Localizable.strings
+++ b/Files/pt-BR.lproj/Localizable.strings
--- a/iOSClient/Trash/NCTrash+CollectionView.swift
+++ b/iOSClient/Trash/NCTrash+CollectionView.swift
@@ -55,9 +55,7 @@ extension NCTrash: UICollectionViewDataSource {
 
				 
			
 
				     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
			
 
				         emptyDataSet?.numberOfItemsInSection(datasource.count, section: section)
			
 
				-        
			
 
				         setNavigationRightItems()
			
 
				-
			
 
				         return datasource.count
			
 
				     }
			
 
				 
			
--- a/iOSClient/Trash/NCTrash.swift
+++ b/iOSClient/Trash/NCTrash.swift
@@ -36,16 +36,14 @@ class NCTrash: UIViewController, NCTrashListCellDelegate, NCEmptyDataSetDelegate
 
				     var blinkFileId: String?
			
 
				     var emptyDataSet: NCEmptyDataSet?
			
 
				     var selectableDataSource: [RealmSwiftObject] { datasource }
			
 
				-
			
 
				+    var dataSourceTask: URLSessionTask?
			
 
				     let appDelegate = (UIApplication.shared.delegate as? AppDelegate)!
			
 
				     let utilityFileSystem = NCUtilityFileSystem()
			
 
				     let utility = NCUtility()
			
 
				-
			
 
				     var isEditMode = false
			
 
				     var selectOcId: [String] = []
			
 
				     var selectIndexPath: [IndexPath] = []
			
 
				     var tabBarSelect: NCSelectableViewTabBar?
			
 
				-
			
 
				     var datasource: [tableTrash] = []
			
 
				     var layoutForView: NCDBLayoutForView?
			
 
				     var listLayout: NCListLayout!
			
@@ -228,18 +226,17 @@ extension NCTrash {
 
				 
			
 
				     @objc func loadListingTrash() {
			
 
				 
			
 
				-        NextcloudKit.shared.listingTrash(showHiddenFiles: false) { account, items, _, error in
			
 
				-
			
 
				+        NextcloudKit.shared.listingTrash(showHiddenFiles: false) { task in
			
 
				+            self.dataSourceTask = task
			
 
				+            self.collectionView.reloadData()
			
 
				+        } completion: { account, items, _, error in
			
 
				             DispatchQueue.main.async { self.refreshControl.endRefreshing() }
			
 
				-
			
 
				             guard error == .success, account == self.appDelegate.account, let trashPath = self.getTrashPath() else {
			
 
				                 NCContentPresenter().showError(error: error)
			
 
				                 return
			
 
				             }
			
 
				-
			
 
				             NCManageDatabase.shared.deleteTrash(filePath: trashPath, account: self.appDelegate.account)
			
 
				             NCManageDatabase.shared.addTrash(account: account, items: items)
			
 
				-
			
 
				             self.reloadDataSource()
			
 
				         }
			
 
				     }
			
@@ -324,24 +321,19 @@ extension NCTrash: NCSelectableNavigationView, NCTrashSelectTabBarDelegate {
 
				         ""
			
 
				     }
			
 
				 
			
 
				-    func setNavigationRightItems(enableMoreMenu: Bool = true) {
			
 
				+    func setNavigationRightItems(enableMenu: Bool = false) {
			
 
				         guard let tabBarSelect = tabBarSelect as? NCTrashSelectTabBar else { return }
			
 
				 
			
 
				         tabBarSelect.isSelectedEmpty = selectOcId.isEmpty
			
 
				-
			
 
				         if isEditMode {
			
 
				             tabBarSelect.show()
			
 
				-
			
 
				             let select = UIBarButtonItem(title: NSLocalizedString("_cancel_", comment: ""), style: .done) { self.toggleSelect() }
			
 
				-
			
 
				             navigationItem.rightBarButtonItems = [select]
			
 
				         } else {
			
 
				             tabBarSelect.hide()
			
 
				-
			
 
				             let menu = UIMenu(children: createMenuActions())
			
 
				             let menuButton = UIBarButtonItem(image: .init(systemName: "ellipsis.circle"), menu: menu)
			
 
				-            menuButton.isEnabled = enableMoreMenu
			
 
				-
			
 
				+            menuButton.isEnabled = true
			
 
				             navigationItem.rightBarButtonItems = [menuButton]
			
 
				         }
			
 
				     }
			
--- a/iOSClient/Viewer/NCViewerMedia/NCViewerMediaPage.swift
+++ b/iOSClient/Viewer/NCViewerMedia/NCViewerMediaPage.swift
@@ -374,11 +374,13 @@ class NCViewerMediaPage: UIViewController {
 
				             return
			
 
				         }
			
 
				 
			
 
				-        metadatas[index] = metadata
			
 
				-        if currentViewController.metadata.ocId == ocId {
			
 
				-            currentViewController.loadImage()
			
 
				-        } else {
			
 
				-            modifiedOcId.append(ocId)
			
 
				+        DispatchQueue.main.async {
			
 
				+            self.metadatas[index] = metadata
			
 
				+            if self.currentViewController.metadata.ocId == ocId {
			
 
				+                self.currentViewController.loadImage()
			
 
				+            } else {
			
 
				+                self.modifiedOcId.append(ocId)
			
 
				+            }
			
 
				         }
			
 
				     }
			
 
				 
			
--- a/iOSClient/Viewer/NCViewerPDF/NCViewerPDF.swift
+++ b/iOSClient/Viewer/NCViewerPDF/NCViewerPDF.swift
@@ -334,12 +334,13 @@ class NCViewerPDF: UIViewController, NCViewerPDFSearchDelegate {
 
				             return
			
 
				         }
			
 
				 
			
 
				-        NCActivityIndicator.shared.stop()
			
 
				-
			
 
				-        if error == .success {
			
 
				-            pdfDocument = PDFDocument(url: URL(fileURLWithPath: filePath))
			
 
				-            pdfView.document = pdfDocument
			
 
				-            pdfView.layoutDocumentView()
			
 
				+        DispatchQueue.main.async {
			
 
				+            NCActivityIndicator.shared.stop()
			
 
				+            if error == .success {
			
 
				+                self.pdfDocument = PDFDocument(url: URL(fileURLWithPath: self.filePath))
			
 
				+                self.pdfView.document = self.pdfDocument
			
 
				+                self.pdfView.layoutDocumentView()
			
 
				+            }
			
 
				         }
			
 
				     }