marinofaggiana 3 years ago
parent
commit
24c1238c64

+ 1 - 1
iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1366,7 +1366,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
             if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)) {
                 (cell as! NCCellProtocol).filePreviewImageView?.image =  UIImage(contentsOfFile: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag))
             } else {
-                NCOperationQueue.shared.downloadThumbnail(metadata: metadata, placeholder: true, cell: cell)
+                NCOperationQueue.shared.downloadThumbnail(metadata: metadata, placeholder: true, cell: cell, view: collectionView)
             }
         }
         

+ 1 - 1
iOSClient/Media/NCMedia.swift

@@ -397,7 +397,7 @@ extension NCMedia: UICollectionViewDataSource {
                 (cell as! NCGridMediaCell).imageItem.backgroundColor = nil
                 (cell as! NCGridMediaCell).imageItem.image = UIImage.init(contentsOfFile: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag))
             } else {
-                NCOperationQueue.shared.downloadThumbnail(metadata: metadata, placeholder: false, cell: cell)
+                NCOperationQueue.shared.downloadThumbnail(metadata: metadata, placeholder: false, cell: cell, view: collectionView)
             }
         }
     }

+ 12 - 4
iOSClient/Networking/NCOperationQueue.swift

@@ -125,7 +125,7 @@ import NCCommunication
     
     // Download Thumbnail
     
-    @objc func downloadThumbnail(metadata: tableMetadata, placeholder: Bool, cell: UIView) {
+    @objc func downloadThumbnail(metadata: tableMetadata, placeholder: Bool, cell: UIView, view: UIView?) {
         
         let cell: NCCellProtocol = cell as! NCCellProtocol
         
@@ -143,7 +143,7 @@ import NCCommunication
                     return
                 }
             }
-            downloadThumbnailQueue.addOperation(NCOperationDownloadThumbnail.init(metadata: metadata, cell: cell))
+            downloadThumbnailQueue.addOperation(NCOperationDownloadThumbnail.init(metadata: metadata, cell: cell, view: view))
         }
     }
     
@@ -394,13 +394,15 @@ class NCOperationDownloadThumbnail: ConcurrentOperation {
    
     var metadata: tableMetadata
     var cell: NCCellProtocol!
+    var view: UIView?
     var fileNamePath: String = ""
     var fileNamePreviewLocalPath: String = ""
     var fileNameIconLocalPath: String = ""
     
-    init(metadata: tableMetadata, cell: NCCellProtocol) {
+    init(metadata: tableMetadata, cell: NCCellProtocol, view: UIView?) {
         self.metadata = tableMetadata.init(value: metadata)
         self.cell = cell
+        self.view = view
         self.fileNamePath = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, account: metadata.account)!
         self.fileNamePreviewLocalPath = CCUtility.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)!
         self.fileNameIconLocalPath = CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)!
@@ -422,8 +424,14 @@ class NCOperationDownloadThumbnail: ConcurrentOperation {
                             animations: { filePreviewImageView.image = imageIcon! },
                             completion: nil)
                     }
+                    
                 } else {
-                    print("Thumbnail: oh oh oh ")
+                    
+                    if self.view is UICollectionView {
+                        (self.view as? UICollectionView)?.reloadData()
+                    } else if self.view is UITableView{
+                        (self.view as? UITableView)?.reloadData()
+                    }                    
                 }
                 
                 self.finish()

+ 1 - 1
iOSClient/Select/NCSelect.swift

@@ -391,7 +391,7 @@ extension NCSelect: UICollectionViewDataSource {
             if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)) {
                 (cell as! NCCellProtocol).filePreviewImageView?.image =  UIImage(contentsOfFile: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag))
             } else {
-                NCOperationQueue.shared.downloadThumbnail(metadata: metadata, placeholder: true, cell: cell)
+                NCOperationQueue.shared.downloadThumbnail(metadata: metadata, placeholder: true, cell: cell, view: collectionView)
             }
         }