coding

Cartfile.resolved

@@ -18,7 +18,7 @@ github "krzyzanowskim/OpenSSL" "1.0.218"
 github "malcommac/SwiftRichString" "3.7.2"
 github "marinofaggiana/KTVHTTPCache" "2.0.2"
 github "marinofaggiana/TOPasscodeViewController" "0.0.7"
-github "nextcloud/ios-communication-library" "34631338c3a591f6328dc9b3834cd58fc9f01691"
+github "nextcloud/ios-communication-library" "7a100b61119b5e2f2ffa1e5b3c386777c86408de"
 github "realm/realm-cocoa" "v5.3.3"
 github "rechsteiner/Parchment" "v2.4.0"
 github "scenee/FloatingPanel" "v1.7.5"

iOSClient/Database/NCManageDatabase.swift

@@ -2339,26 +2339,12 @@ class NCManageDatabase: NSObject {
     @objc func isLivePhoto(metadata: tableMetadata) -> tableMetadata? {
            
         let realm = try! Realm()
-        realm.refresh()
-        
-        if metadata.typeFile != k_metadataTypeFile_image && metadata.typeFile != k_metadataTypeFile_video  { return nil }
-        if !CCUtility.getLivePhoto() {return nil }
-        let ext = (metadata.fileNameView as NSString).pathExtension.lowercased()
-        var predicate = NSPredicate()
         
-        if ext == "mov" {
-               
-            let fileNameJPG = (metadata.fileNameView as NSString).deletingPathExtension + ".jpg"
-            let fileNameHEIC = (metadata.fileNameView as NSString).deletingPathExtension + ".heic"
-            predicate = NSPredicate(format: "account == %@ AND serverUrl == %@ AND (fileNameView LIKE[c] %@ OR fileNameView LIKE[c] %@)", metadata.account, metadata.serverUrl, fileNameJPG, fileNameHEIC)
-            
-        } else {
-               
-            let fileName = (metadata.fileNameView as NSString).deletingPathExtension + ".mov"
-            predicate = NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameView LIKE[c] %@", metadata.account, metadata.serverUrl, fileName)
+        if !metadata.livePhoto || !CCUtility.getLivePhoto() {
+            return nil
         }
         
-        guard let result = realm.objects(tableMetadata.self).filter(predicate).first else {
+        guard let result = realm.objects(tableMetadata.self).filter(NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameWithoutExt == %@ AND ocId != %@", metadata.account, metadata.serverUrl, metadata.fileNameWithoutExt, metadata.ocId)).first else {
             return nil
         }