clear code

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -55,7 +55,7 @@ extension NCCreateFormUploadConflictDelegate {
     @objc var serverUrl: String?
     @objc weak var delegate: NCCreateFormUploadConflictDelegate?
     @objc var alwaysNewFileNameNumber: Bool = false
-    @objc var textLabelNewFiles: String?
+    @objc var textLabelDetailNewFile: String?
     
     var metadatasConflictNewFiles = [String]()
     var metadatasConflictAlreadyExistingFiles = [String]()
@@ -383,8 +383,8 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
             }
             
             // text label new file
-            if textLabelNewFiles != nil {
-                cell.labelDetailNewFile.text = textLabelNewFiles
+            if textLabelDetailNewFile != nil {
+                cell.labelDetailNewFile.text = textLabelDetailNewFile! + "\n"
             }
             
             return cell

iOSClient/Main/Create cloud/NCCreateFormUploadDocuments.swift

@@ -274,7 +274,7 @@ 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 conflictViewController = UIStoryboard(name: "NCCreateFormUploadConflict", bundle: nil).instantiateInitialViewController() as? NCCreateFormUploadConflict else { return }
-                conflictViewController.textLabelNewFiles = NSLocalizedString("_now_", comment: "")
+                conflictViewController.textLabelDetailNewFile = NSLocalizedString("_now_", comment: "")
                 conflictViewController.alwaysNewFileNameNumber = true
                 conflictViewController.serverUrl = serverUrl
                 conflictViewController.metadatasUploadInConflict = [metadata]

iOSClient/Main/Create cloud/NCCreateFormUploadScanDocument.swift

@@ -413,7 +413,7 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
             guard let metadata = CCUtility.createMetadata(withAccount: appDelegate.activeAccount, date: Date(), directory: false, ocId: ocId, serverUrl: serverUrl, fileName: fileNameSave, etag: "", size: 0, status: 0, url: appDelegate.activeUrl, contentType: "") else { return }
             
             guard let conflictViewController = UIStoryboard(name: "NCCreateFormUploadConflict", bundle: nil).instantiateInitialViewController() as? NCCreateFormUploadConflict else { return }
-            conflictViewController.textLabelNewFiles = NSLocalizedString("_now_", comment: "")
+            conflictViewController.textLabelDetailNewFile = NSLocalizedString("_now_", comment: "")
             conflictViewController.serverUrl = self.serverUrl
             conflictViewController.metadatasUploadInConflict = [metadata]
             conflictViewController.delegate = self