Improvements

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -54,6 +54,7 @@ extension NCCreateFormUploadConflictDelegate {
     @objc var metadatasMOV: [tableMetadata]
     @objc var serverUrl: String?
     @objc weak var delegate: NCCreateFormUploadConflictDelegate?
+    @objc var alwaysNewFileNameNumber: Bool = false
     
     var metadatasConflictNewFiles = [String]()
     var metadatasConflictAlreadyExistingFiles = [String]()
@@ -115,9 +116,7 @@ extension NCCreateFormUploadConflictDelegate {
             }
         }
         
-        tableView.reloadData()
-        
-        canContinue()
+       verifySwith()
     }
     
     @IBAction func valueChangedSwitchAlreadyExistingFiles(_ sender: Any) {
@@ -129,11 +128,28 @@ extension NCCreateFormUploadConflictDelegate {
             }
         }
         
-        tableView.reloadData()
+        verifySwith()
+    }
+    
+    func verifySwith() {
         
+        if alwaysNewFileNameNumber && (switchNewFiles.isOn || switchAlreadyExistingFiles.isOn) {
+            metadatasConflictNewFiles.removeAll()
+            metadatasConflictAlreadyExistingFiles.removeAll()
+            
+            for metadata in metadatasUploadInConflict {
+                metadatasConflictNewFiles.append(metadata.ocId)
+            }
+            for metadata in metadatasUploadInConflict {
+                metadatasConflictAlreadyExistingFiles.append(metadata.ocId)
+            }
+        }
+        
+        tableView.reloadData()
         canContinue()
     }
     
+    
     @IBAction func buttonCancelTouch(_ sender: Any) {
         
         delegate?.dismissCreateFormUploadConflict(metadatas: nil)

iOSClient/Main/Create cloud/NCCreateFormUploadDocuments.swift

@@ -273,12 +273,13 @@ import NCCommunication
                 
                 guard let metadata = CCUtility.createMetadata(withAccount: appDelegate.activeAccount, date: Date(), directory: false, ocId: "", serverUrl: serverUrl, fileName: String(describing: fileNameForm), etag: "", size: 0, status: 0, url: appDelegate.activeUrl, contentType: "") else { return }
                 
-                guard let conflict = UIStoryboard(name: "NCCreateFormUploadConflict", bundle: nil).instantiateInitialViewController() as? NCCreateFormUploadConflict else { return }
-                conflict.serverUrl = serverUrl
-                conflict.metadatasUploadInConflict = [metadata]
-                conflict.delegate = self
+                guard let conflictViewController = UIStoryboard(name: "NCCreateFormUploadConflict", bundle: nil).instantiateInitialViewController() as? NCCreateFormUploadConflict else { return }
+                conflictViewController.alwaysNewFileNameNumber = true
+                conflictViewController.serverUrl = serverUrl
+                conflictViewController.metadatasUploadInConflict = [metadata]
+                conflictViewController.delegate = self
                 
-                self.present(conflict, animated: true, completion: nil)
+                self.present(conflictViewController, animated: true, completion: nil)
                 
             } else {