background

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
nextcloud · Oct 8, 2024 · 8f1dd81 · 8f1dd81
1 parent 426e5ae
commit 8f1dd81
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/iOSClient/Files/NCFiles.swift b/iOSClient/Files/NCFiles.swift
@@ -171,21 +171,21 @@ class NCFiles: NCCollectionViewCommon {
 
         DispatchQueue.global().async {
             self.networkReadFolder { tableDirectory, metadatas, reloadDataSource, error in
-                DispatchQueue.main.async {
-                    if error == .success {
-                        for metadata in metadatas ?? [] where !metadata.directory && downloadMetadata(metadata) {
-                            if NCNetworking.shared.downloadQueue.operations.filter({ ($0 as? NCOperationDownload)?.metadata.ocId == metadata.ocId }).isEmpty {
-                                NCNetworking.shared.downloadQueue.addOperation(NCOperationDownload(metadata: metadata, selector: NCGlobal.shared.selectorDownloadFile))
-                            }
+                if error == .success {
+                    for metadata in metadatas ?? [] where !metadata.directory && downloadMetadata(metadata) {
+                        if NCNetworking.shared.downloadQueue.operations.filter({ ($0 as? NCOperationDownload)?.metadata.ocId == metadata.ocId }).isEmpty {
+                            NCNetworking.shared.downloadQueue.addOperation(NCOperationDownload(metadata: metadata, selector: NCGlobal.shared.selectorDownloadFile))
                         }
-
-                        self.richWorkspaceText = tableDirectory?.richWorkspace
                     }
 
-                    if reloadDataSource || self.isNumberOfItemsInAllSectionsNull {
-                        self.reloadDataSource()
-                    }
+                    self.richWorkspaceText = tableDirectory?.richWorkspace
+                }
+
+                if reloadDataSource || self.isNumberOfItemsInAllSectionsNull {
+                    self.reloadDataSource()
+                }
 
+                DispatchQueue.main.async {
                     self.refreshControl.endRefreshing()
                 }
             }

diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift
@@ -1048,11 +1048,13 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     @objc func reloadDataSource() {
         guard !session.account.isEmpty, !self.isSearchingMode else { return }
 
-        UIView.transition(with: self.collectionView,
-                          duration: 0.20,
-                          options: .transitionCrossDissolve,
-                          animations: { self.collectionView.reloadData() },
-                          completion: nil)
+        DispatchQueue.main.async {
+            UIView.transition(with: self.collectionView,
+                              duration: 0.20,
+                              options: .transitionCrossDissolve,
+                              animations: { self.collectionView.reloadData() },
+                              completion: nil)
+        }
     }
 
     func getServerData() {