marinofaggiana 4 жил өмнө
parent
commit
1e98064ad1

+ 10 - 15
iOSClient/Main/NCCollectionCommon.swift

@@ -361,21 +361,18 @@ class NCCollectionCommon: NSObject {
     }
     
     func notificationDownloadStartFile(collectionView: UICollectionView?, dataSource: NCDataSource?, metadata: tableMetadata) {
-        if dataSource?.reloadMetadata(ocId: metadata.ocId) ?? false {
-            collectionView?.reloadData()
-        }
+        dataSource?.reloadMetadata(ocId: metadata.ocId)
+        collectionView?.reloadData()
     }
     
     func notificationDownloadedFile(collectionView: UICollectionView?, dataSource: NCDataSource?, metadata: tableMetadata) {
-        if dataSource?.reloadMetadata(ocId: metadata.ocId) ?? false {
-            collectionView?.reloadData()
-        }
+        dataSource?.reloadMetadata(ocId: metadata.ocId)
+        collectionView?.reloadData()
     }
     
     func notificationDownloadCancelFile(collectionView: UICollectionView?, dataSource: NCDataSource?, metadata: tableMetadata) {
-        if dataSource?.reloadMetadata(ocId: metadata.ocId) ?? false {
-            collectionView?.reloadData()
-        }
+        dataSource?.reloadMetadata(ocId: metadata.ocId)
+        collectionView?.reloadData()
     }
     
     func notificationUploadStartFile(collectionView: UICollectionView?, dataSource: NCDataSource?, metadata: tableMetadata, serverUrl: String, account: String) {
@@ -387,17 +384,15 @@ class NCCollectionCommon: NSObject {
     
     func notificationUploadedFile(collectionView: UICollectionView?, dataSource: NCDataSource?, metadata: tableMetadata, serverUrl: String, account: String) {
         if metadata.serverUrl == serverUrl && metadata.account == account {
-            if dataSource?.reloadMetadata(ocId: metadata.ocId) ?? false {
-                collectionView?.reloadData()
-            }
+            dataSource?.reloadMetadata(ocId: metadata.ocId)
+            collectionView?.reloadData()
         }
     }
     
     func notificationUploadCancelFile(collectionView: UICollectionView?, dataSource: NCDataSource?, metadata: tableMetadata, serverUrl: String, account: String) {
         if metadata.serverUrl == serverUrl && metadata.account == account {
-            if dataSource?.deleteMetadata(ocId: metadata.ocId) ?? false {
-                collectionView?.reloadData()
-            }
+            dataSource?.deleteMetadata(ocId: metadata.ocId)
+            collectionView?.reloadData()
         }
     }
         

+ 2 - 8
iOSClient/Main/NCDataSource.swift

@@ -139,24 +139,18 @@ import Foundation
         return (directories, files, size)
     }
     
-    @objc func deleteMetadata(ocId: String) -> Bool {
-        var found = false
+    @objc func deleteMetadata(ocId: String) {
         if let index = self.getIndexMetadata(ocId: ocId) {
             self.metadatas.remove(at: index)
-            found = true
         }
-        return found
     }
     
-    @objc func reloadMetadata(ocId: String) -> Bool {
-        var found = false
+    @objc func reloadMetadata(ocId: String) {
         if let index = self.getIndexMetadata(ocId: ocId) {
             if let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@", ocId)) {
                 self.metadatas[index] = metadata
-                found = true
             }
         }
-        return found
     }
     
     @objc func addMetadata(_ metadata: tableMetadata) {