Improvement view image

Signed-off-by: marinofaggiana <ios@nextcloud.com>

1 files changed, 11 insertions, 13 deletions

diff --git a/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift b/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift
index 5374ab823..ef7aa392c 100644
--- a/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift
+++ b/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift
@@ -255,33 +255,24 @@ class NCViewerMedia: UIViewController {
                 queue: .main) { _, _, imageIcon, _, etag, errorCode, _ in
 
                     if let image = imageIcon, errorCode == 0 {
-                        if self.imageVideoContainer.layer.sublayers?.count == nil {
+                        if self.metadata.ocId == metadata.ocId && self.imageVideoContainer.layer.sublayers?.count == nil {
                             self.image = image
                             self.imageVideoContainer.image = image
                         }
                         NCManageDatabase.shared.setMetadataEtagResource(ocId: metadata.ocId, etagResource: etag)
                     }
-
-                    downloadFile(metadata: metadata)
                 }
-        } else {
-
-            let image = getImageMetadata(metadata)
-            if self.metadata.ocId == metadata.ocId && self.imageVideoContainer.layer.sublayers?.count == nil {
-                self.image = image
-                self.imageVideoContainer.image = image
-            }
-            downloadFile(metadata: metadata)
         }
 
-        func downloadFile(metadata: tableMetadata) {
+        // Download image
+        if !CCUtility.fileProviderStorageExists(metadata) && metadata.classFile == NCCommunicationCommon.typeClassFile.image.rawValue && metadata.session == "" {
+
             if metadata.livePhoto {
                 let fileName = (metadata.fileNameView as NSString).deletingPathExtension + ".mov"
                 if let metadata = NCManageDatabase.shared.getMetadata(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameView LIKE[c] %@", metadata.account, metadata.serverUrl, fileName)), !CCUtility.fileProviderStorageExists(metadata) {
                     NCNetworking.shared.download(metadata: metadata, selector: "") { _ in }
                 }
             }
-            guard metadata.classFile == NCCommunicationCommon.typeClassFile.image.rawValue, !CCUtility.fileProviderStorageExists(metadata), metadata.session == "" else { return }
 
             NCNetworking.shared.download(metadata: metadata, selector: "") { _ in
                 let image = getImageMetadata(metadata)
@@ -292,6 +283,13 @@ class NCViewerMedia: UIViewController {
             }
         }
 
+        // Get image
+        let image = getImageMetadata(metadata)
+        if self.metadata.ocId == metadata.ocId && self.imageVideoContainer.layer.sublayers?.count == nil {
+            self.image = image
+            self.imageVideoContainer.image = image
+        }
+
         func getImageMetadata(_ metadata: tableMetadata) -> UIImage? {
 
             if let image = getImage(metadata: metadata) {