Improvements

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -24,11 +24,11 @@
 import Foundation
 
 @objc protocol NCCreateFormUploadConflictDelegate {
-    @objc func dismissCreateFormUploadConflict(metadatas: [tableMetadata])
+    @objc func dismissCreateFormUploadConflict(metadatas: [tableMetadata]?)
 }
 
 extension NCCreateFormUploadConflictDelegate {
-    func dismissCreateFormUploadConflict(metadatas: [tableMetadata]) {}
+    func dismissCreateFormUploadConflict(metadatas: [tableMetadata]?) {}
 }
 
 @objc class NCCreateFormUploadConflict: UIViewController {
@@ -135,6 +135,8 @@ extension NCCreateFormUploadConflictDelegate {
     }
     
     @IBAction func buttonCancelTouch(_ sender: Any) {
+        
+        delegate?.dismissCreateFormUploadConflict(metadatas: nil)
         dismiss(animated: true)
     }
     

iOSClient/Main/Create cloud/NCCreateFormUploadDocuments.swift

@@ -288,12 +288,21 @@ import NCCommunication
         }
     }
     
-    func dismissCreateFormUploadConflict(metadatas: [tableMetadata]) {
+    func dismissCreateFormUploadConflict(metadatas: [tableMetadata]?) {
         
-        let fileName = metadatas[0].fileName
-        let fileNamePath = CCUtility.returnFileNamePath(fromFileName: fileName, serverUrl: serverUrl, activeUrl: appDelegate.activeUrl)!
-        
-        createDocument(fileNamePath: fileNamePath, fileName: fileName)
+        if metadatas == nil || metadatas?.count == 0 {
+            
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+                self.cancel()
+            }
+            
+        } else {
+            
+            let fileName = metadatas![0].fileName
+            let fileNamePath = CCUtility.returnFileNamePath(fromFileName: fileName, serverUrl: serverUrl, activeUrl: appDelegate.activeUrl)!
+            
+            createDocument(fileNamePath: fileNamePath, fileName: fileName)
+        }
     }
     
     func createDocument(fileNamePath: String, fileName: String) {