Browse Source

fix

Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com>
Marino Faggiana 1 year ago
parent
commit
cd4ce3fcc3

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

@@ -1209,7 +1209,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                     }
                     if metadata.hasPreview && metadata.status == NCGlobal.shared.metadataStatusNormal && (!CCUtility.fileProviderStoragePreviewIconExists(metadata.ocId, etag: metadata.etag)) {
                         for case let operation as NCCollectionViewDownloadThumbnail in appDelegate.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId { return }
-                        appDelegate.downloadThumbnailQueue.addOperation(NCCollectionViewDownloadThumbnail(metadata: metadata, cell: (cell as? NCCellProtocol), view: view))
+                        appDelegate.downloadThumbnailQueue.addOperation(NCCollectionViewDownloadThumbnail(metadata: metadata, cell: (cell as? NCCellProtocol), collectionView: collectionView))
                     }
                 }
             } else {
@@ -1745,15 +1745,15 @@ class NCCollectionViewDownloadThumbnail: ConcurrentOperation {
 
     var metadata: tableMetadata
         var cell: NCCellProtocol?
-        var view: UIView?
+        var collectionView: UICollectionView?
         var fileNamePath: String
         var fileNamePreviewLocalPath: String
         var fileNameIconLocalPath: String
 
-    init(metadata: tableMetadata, cell: NCCellProtocol?, view: UIView?) {
+    init(metadata: tableMetadata, cell: NCCellProtocol?, collectionView: UICollectionView?) {
         self.metadata = tableMetadata.init(value: metadata)
         self.cell = cell
-        self.view = view
+        self.collectionView = collectionView
         self.fileNamePath = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId, account: metadata.account)!
         self.fileNamePreviewLocalPath = CCUtility.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)!
         self.fileNameIconLocalPath = CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)!
@@ -1786,6 +1786,8 @@ class NCCollectionViewDownloadThumbnail: ConcurrentOperation {
                                           options: .transitionCrossDissolve,
                                           animations: { filePreviewImageView.image = image },
                                           completion: nil)
+                    } else {
+                        self.collectionView?.reloadData()
                     }
                 }
             }

+ 6 - 4
iOSClient/Media/NCMedia.swift

@@ -383,7 +383,7 @@ extension NCMedia: UICollectionViewDataSource {
         } else {
             if metadata.hasPreview && metadata.status == NCGlobal.shared.metadataStatusNormal && (!CCUtility.fileProviderStoragePreviewIconExists(metadata.ocId, etag: metadata.etag)) {
                 for case let operation as NCMediaDownloadThumbnaill in appDelegate.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId { return }
-                appDelegate.downloadThumbnailQueue.addOperation(NCMediaDownloadThumbnaill(metadata: metadata, cell: cell, view: view))
+                appDelegate.downloadThumbnailQueue.addOperation(NCMediaDownloadThumbnaill(metadata: metadata, cell: cell, collectionView: collectionView))
             }
         }
     }
@@ -861,15 +861,15 @@ class NCMediaDownloadThumbnaill: ConcurrentOperation {
 
     var metadata: tableMetadata
     var cell: NCCellProtocol?
-    var view: UIView?
+    var collectionView: UICollectionView?
     var fileNamePath: String
     var fileNamePreviewLocalPath: String
     var fileNameIconLocalPath: String
 
-    init(metadata: tableMetadata, cell: NCCellProtocol?, view: UIView?) {
+    init(metadata: tableMetadata, cell: NCCellProtocol?, collectionView: UICollectionView?) {
         self.metadata = tableMetadata.init(value: metadata)
         self.cell = cell
-        self.view = view
+        self.collectionView = collectionView
         self.fileNamePath = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId, account: metadata.account)!
         self.fileNamePreviewLocalPath = CCUtility.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)!
         self.fileNameIconLocalPath = CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)!
@@ -902,6 +902,8 @@ class NCMediaDownloadThumbnaill: ConcurrentOperation {
                                           options: .transitionCrossDissolve,
                                           animations: { filePreviewImageView.image = image },
                                           completion: nil)
+                    } else {
+                        self.collectionView?.reloadData()
                     }
                 }
                 NCMediaCache.shared.setImage(ocId: self.metadata.ocId, image: image)

+ 1 - 1
iOSClient/Select/NCSelect.swift

@@ -308,7 +308,7 @@ extension NCSelect: UICollectionViewDataSource {
                 }
                 if metadata.hasPreview && metadata.status == NCGlobal.shared.metadataStatusNormal && (!CCUtility.fileProviderStoragePreviewIconExists(metadata.ocId, etag: metadata.etag)) {
                     for case let operation as NCCollectionViewDownloadThumbnail in appDelegate.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId { return }
-                    appDelegate.downloadThumbnailQueue.addOperation(NCCollectionViewDownloadThumbnail(metadata: metadata, cell: (cell as? NCCellProtocol), view: view))
+                    appDelegate.downloadThumbnailQueue.addOperation(NCCollectionViewDownloadThumbnail(metadata: metadata, cell: (cell as? NCCellProtocol), collectionView: collectionView))
                 }
             }
         }