marinofaggiana 4 rokov pred
rodič
commit
ba5612fe46

+ 5 - 1
iOSClient/Main/Colleaction Common/NCCollectionViewCommon.swift

@@ -1067,7 +1067,11 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
             }
             
             let copy = UIAction(title: NSLocalizedString("_copy_file_", comment: ""), image: UIImage(systemName: "doc.on.doc") ) { action in
-                NCCollectionCommon.shared.copyFile(ocIds: [metadata.ocId])
+                if metadataMOV != nil {
+                    NCCollectionCommon.shared.copyFile(ocIds: [metadata.ocId, metadataMOV!.ocId])
+                } else {
+                    NCCollectionCommon.shared.copyFile(ocIds: [metadata.ocId])
+                }
             }
             
             let detail = UIAction(title: NSLocalizedString("_details_", comment: ""), image: UIImage(systemName: "info") ) { action in

+ 10 - 1
iOSClient/Main/Menu/NCCollectionViewCommon+Menu.swift

@@ -362,7 +362,16 @@ extension NCCollectionViewCommon {
                     title: NSLocalizedString("_copy_file_", comment: ""),
                     icon: UIImage(systemName: "doc.on.doc")!.image(color: NCBrandColor.shared.icon, size: 50),
                     action: { menuAction in
-                        NCCollectionCommon.shared.copyFile(ocIds: selectOcId)
+                        var copyOcIds = [String]()
+                        for ocId in selectOcId {
+                            copyOcIds.append(ocId)
+                            if let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) {
+                                if let metadataMOV = NCManageDatabase.shared.isLivePhoto(metadata: metadata) {
+                                    copyOcIds.append(metadataMOV.ocId)
+                                }
+                            }
+                        }
+                        NCCollectionCommon.shared.copyFile(ocIds: copyOcIds)
                         self.tapSelect(sender: self)
                     }
                 )