浏览代码

coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>
marinofaggiana 2 年之前
父节点
当前提交
b0d502da07
共有 2 个文件被更改,包括 12 次插入9 次删除
  1. 5 5
      iOSClient/Files/NCFiles.swift
  2. 7 4
      iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

+ 5 - 5
iOSClient/Files/NCFiles.swift

@@ -73,11 +73,11 @@ class NCFiles: NCCollectionViewCommon {
     override func reloadDataSource() {
         super.reloadDataSource()
 
-        if !self.isSearching && !self.appDelegate.account.isEmpty && !self.appDelegate.urlBase.isEmpty {
-            self.metadatasSource = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", self.appDelegate.account, self.serverUrl))
-            if self.metadataFolder == nil {
-                self.metadataFolder = NCManageDatabase.shared.getMetadataFolder(account: self.appDelegate.account, urlBase: self.appDelegate.urlBase, serverUrl: self.serverUrl)
-            }
+        guard !self.isSearching, !self.appDelegate.account.isEmpty, !self.appDelegate.urlBase.isEmpty else { return }
+
+        self.metadatasSource = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", self.appDelegate.account, self.serverUrl))
+        if self.metadataFolder == nil {
+            self.metadataFolder = NCManageDatabase.shared.getMetadataFolder(account: self.appDelegate.account, urlBase: self.appDelegate.urlBase, serverUrl: self.serverUrl)
         }
 
         self.dataSource = NCDataSource(

+ 7 - 4
iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1092,10 +1092,13 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
                 guard let metadatas = metadatas, metadatas.count > 0, self.isSearching , let searchResult = searchResult else { return }
                 NCOperationQueue.shared.dataSourceAddSection(collectionViewCommon: self, metadatas: metadatas, searchResult: searchResult)
             } completion: {searchResults, errorCode, errorDescription in
-                self.searchResults = searchResults
-                self.refreshControl.endRefreshing()
-                self.isReloadDataSourceNetworkInProgress = false
-                self.collectionView.reloadData()
+//                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+//                    self.searchResults = searchResults
+//                    self.refreshControl.endRefreshing()
+//                    self.isReloadDataSourceNetworkInProgress = false
+//                    self.collectionView.reloadData()
+//                }
+                
             }
 
         } else {