coding

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -254,7 +254,7 @@ class NCCreateFormUploadConflict: UIViewController {
                 metadata.fileNameView = newFileName
 
                 // This is not an asset - [file]
-                if metadata.assetLocalIdentifier == "" {
+                if metadata.assetLocalIdentifier == "" || metadata.isExtractFile {
                     let newPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: newFileName)
                     CCUtility.moveFile(atPath: oldPath, toPath: newPath)
                 }

iOSClient/Main/Create cloud/NCUploadAssets.swift

@@ -208,6 +208,12 @@ struct UploadAssetsView: View {
 
             // Modified
             if let previewStore = uploadAssets.previewStore.first(where: {$0.localIdentifier == asset.localIdentifier && $0.modify == true }), let data = previewStore.image.jpegData(compressionQuality: 1) {
+                if metadata.contentType == "image/heic" {
+                    let fileNameNoExtension = (fileName as NSString).deletingPathExtension
+                    metadata.contentType = "image/jpeg"
+                    metadata.fileName = fileNameNoExtension + ".jpg"
+                    metadata.fileNameView = fileNameNoExtension + ".jpg"
+                }
                 let fileNamePath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
                 do {
                     try data.write(to: URL(fileURLWithPath: fileNamePath))