Improvements

iOSClient/Main/Create cloud/NCCreateFormUploadDocuments.swift

@@ -271,13 +271,13 @@ import NCCommunication
             
             if NCUtility.sharedInstance.getMetadataConflict(account: appDelegate.activeAccount, serverUrl: serverUrl, fileName: String(describing: fileNameForm)) != nil {
                 
-                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 metadataForUpload = 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.textLabelDetailNewFile = NSLocalizedString("_now_", comment: "")
                 conflictViewController.alwaysNewFileNameNumber = true
                 conflictViewController.serverUrl = serverUrl
-                conflictViewController.metadatasUploadInConflict = [metadata]
+                conflictViewController.metadatasUploadInConflict = [metadataForUpload]
                 conflictViewController.delegate = self
                 
                 self.present(conflictViewController, animated: true, completion: nil)

iOSClient/Main/Create cloud/NCCreateFormUploadScanDocument.swift

@@ -408,21 +408,12 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
         }
         
         //Create metadata for upload
-        let metadataForUpload = tableMetadata()
-        
-        metadataForUpload.account = self.appDelegate.activeAccount
-        metadataForUpload.date = NSDate()
-        metadataForUpload.fileName = fileNameSave
-        metadataForUpload.fileNameView = fileNameSave
-        metadataForUpload.ocId = CCUtility.createMetadataID(fromAccount: self.appDelegate.activeAccount, serverUrl: serverUrl, fileNameView: fileNameSave, directory: false)!
-        metadataForUpload.serverUrl = serverUrl
+        let ocId = CCUtility.createMetadataID(fromAccount: self.appDelegate.activeAccount, serverUrl: serverUrl, fileNameView: fileNameSave, directory: false)!
+        guard let metadataForUpload = 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 }
+        
         metadataForUpload.session = k_upload_session
         metadataForUpload.sessionSelector = selectorUploadFile
         metadataForUpload.status = Int(k_metadataStatusWaitUpload)
-        let results = NCCommunicationCommon.sharedInstance.getInternalContenType(fileName: fileNameSave, contentType: "", directory: false)
-        metadataForUpload.contentType = results.contentType
-        metadataForUpload.iconName = results.iconName
-        metadataForUpload.typeFile = results.typeFile
                 
         if NCUtility.sharedInstance.getMetadataConflict(account: appDelegate.activeAccount, serverUrl: serverUrl, fileName: fileNameSave) != nil {
                         

iOSClient/Utility/CCUtility.m

@@ -1632,12 +1632,16 @@
     metadata.status = status;
     metadata.url = url;
     
+    [self insertTypeFileIconName:fileName metadata:metadata];
+    
+    /*
     NSDictionary *results = [[NCCommunicationCommon sharedInstance] objcGetInternalContenTypeWithFileName:fileName contentType:@"" directory:directory];
     
     metadata.contentType = results[@"contentType"];
     metadata.iconName = results[@"iconName"];
     metadata.typeFile = results[@"typeFile"];
-
+    */
+    
     return metadata;
 }