coding

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

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -517,6 +517,8 @@ struct UploadConflictView: UIViewControllerRepresentable {
     var delegate: NCCreateFormUploadConflictDelegate
     var serverUrl: String
     var metadatasUploadInConflict: [tableMetadata]
+    var metadatasNOConflict: [tableMetadata]
+
 
     func makeUIViewController(context: Context) -> UIViewControllerType {
 
@@ -527,6 +529,7 @@ struct UploadConflictView: UIViewControllerRepresentable {
         viewController?.textLabelDetailNewFile = NSLocalizedString("_now_", comment: "")
         viewController?.serverUrl = serverUrl
         viewController?.metadatasUploadInConflict = metadatasUploadInConflict
+        viewController?.metadatasNOConflict = metadatasNOConflict
 
         return viewController!
     }

iOSClient/Main/Create cloud/NCUploadAssets.swift

@@ -55,14 +55,13 @@ class NCUploadAssets: ObservableObject, NCCreateFormUploadConflictDelegate {
 
     func dismissCreateFormUploadConflict(metadatas: [tableMetadata]?) {
 
-        var metadatasToUpload = metadatasNOConflict
-
         if let metadatas = metadatas {
-            metadatasToUpload.append(contentsOf: metadatas)
-        }
-        NCNetworkingProcessUpload.shared.createProcessUploads(metadatas: metadatasToUpload, completion: { _ in
+            NCNetworkingProcessUpload.shared.createProcessUploads(metadatas: metadatas, completion: { _ in
+                self.dismiss = true
+            })
+        } else {
             self.dismiss = true
-        })
+        }
     }
 }
 
@@ -274,7 +273,7 @@ struct UploadAssetsView: View {
             SelectView(serverUrl: $uploadAssets.serverUrl)
         }
         .sheet(isPresented: $isPresentedUploadConflict) {
-            UploadConflictView(delegate: uploadAssets, serverUrl: uploadAssets.serverUrl, metadatasUploadInConflict: uploadAssets.metadatasUploadInConflict)
+            UploadConflictView(delegate: uploadAssets, serverUrl: uploadAssets.serverUrl, metadatasUploadInConflict: uploadAssets.metadatasUploadInConflict, metadatasNOConflict: uploadAssets.metadatasNOConflict)
         }
         .onReceive(uploadAssets.$dismiss) { _ in
             presentationMode.wrappedValue.dismiss()

iOSClient/Scan document/NCUploadScanDocument.swift

@@ -500,7 +500,7 @@ struct UploadScanDocumentView: View {
             NCSelectViewControllerRepresentable(delegate: uploadScanDocument)
         }
         .sheet(isPresented: $isPresentedUploadConflict) {
-            UploadConflictView(delegate: uploadScanDocument, serverUrl: uploadScanDocument.serverUrl, metadatasUploadInConflict: [uploadScanDocument.metadata])
+            UploadConflictView(delegate: uploadScanDocument, serverUrl: uploadScanDocument.serverUrl, metadatasUploadInConflict: [uploadScanDocument.metadata], metadatasNOConflict: [])
         }.onTapGesture {
             dismissKeyboard()
         }