dev

iOSClient/Main/CCMain.m

@@ -1089,7 +1089,8 @@
         metadataForUpload.sessionSelector = selectorUploadFile;
         metadataForUpload.size = [[NCUtility sharedInstance] getFileSizeWithAsset:asset];
         metadataForUpload.status = k_metadataStatusWaitUpload;
-                
+        [CCUtility insertTypeFileIconName:fileName metadata:metadataForUpload];
+        
         // verify exists conflict
         NSString *fileNameExtension = [fileName pathExtension].lowercaseString;
         NSString *fileNameWithoutExtension = [fileName stringByDeletingPathExtension];

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -214,16 +214,10 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
             cell.labelFileName.text = metadata.fileNameView
 
             // Image New
-            if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, fileNameView: metadata.fileName)) {
-                NCUtility.sharedInstance.loadImage(ocId: metadata.ocId, fileNameView: metadata.fileNameView) { (image) in
-                    cell.imageFileNew.image = image
-                }
+            if metadata.iconName.count > 0 {
+                cell.imageFileNew.image = UIImage.init(named: metadata.iconName)
             } else {
-                if metadata.iconName.count > 0 {
-                    cell.imageFileNew.image = UIImage.init(named: metadata.iconName)
-                } else {
-                    cell.imageFileNew.image = UIImage.init(named: "file")
-                }
+                cell.imageFileNew.image = UIImage.init(named: "file")
             }
             
             // Image