Эх сурвалжийг харах

fix e2ee live photo

Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com>
Marino Faggiana 1 жил өмнө
parent
commit
2844660894

+ 2 - 2
iOSClient/Utility/NCUtility.swift

@@ -414,7 +414,7 @@ class NCUtility: NSObject {
 
 
         // see https://stackoverflow.com/questions/71764255
         // see https://stackoverflow.com/questions/71764255
         let sfSymbolName = imageName.replacingOccurrences(of: "_", with: ".")
         let sfSymbolName = imageName.replacingOccurrences(of: "_", with: ".")
-        if let symbolConfiguration = symbolConfiguration {
+        if let symbolConfiguration {
             image = UIImage(systemName: sfSymbolName, withConfiguration: symbolConfiguration as? UIImage.Configuration)?.withTintColor(color, renderingMode: renderingMode)
             image = UIImage(systemName: sfSymbolName, withConfiguration: symbolConfiguration as? UIImage.Configuration)?.withTintColor(color, renderingMode: renderingMode)
         } else {
         } else {
             image = UIImage(systemName: sfSymbolName)?.withTintColor(color, renderingMode: renderingMode)
             image = UIImage(systemName: sfSymbolName)?.withTintColor(color, renderingMode: renderingMode)
@@ -422,7 +422,7 @@ class NCUtility: NSObject {
         if image == nil {
         if image == nil {
             image = UIImage(named: imageName)?.image(color: color, size: size)
             image = UIImage(named: imageName)?.image(color: color, size: size)
         }
         }
-        if let image = image {
+        if let image {
             return image
             return image
         }
         }
 
 

+ 4 - 8
iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift

@@ -276,14 +276,10 @@ class NCViewerMedia: UIViewController {
         guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(metadata.ocId) else { return }
         guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(metadata.ocId) else { return }
         self.metadata = metadata
         self.metadata = metadata
 
 
-        // Download image
-        if !utilityFileSystem.fileProviderStorageExists(metadata) && metadata.isImage && metadata.session.isEmpty {
-
-            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)), !utilityFileSystem.fileProviderStorageExists(metadata) {
-                    NCNetworking.shared.download(metadata: metadata, selector: "") { _, _ in }
-                }
+        if metadata.livePhoto {
+            let fileNameMOV = (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, fileNameMOV)), !utilityFileSystem.fileProviderStorageExists(metadata) {
+                NCNetworking.shared.download(metadata: metadata, selector: "") { _, _ in }
             }
             }
         }
         }