dev

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -213,33 +213,33 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
             
             cell.labelFileName.text = metadata.fileNameView
 
-            // Image
-            if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadataInConflict.ocId, fileNameView: metadataInConflict.fileName)) {
-                NCUtility.sharedInstance.loadImage(ocId: metadataInConflict.ocId, fileNameView: metadataInConflict.fileNameView) { (image) in
-                    cell.imageFile.image = image
+            // 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
                 }
             } else {
-                if metadataInConflict.iconName.count > 0 {
-                    cell.imageFile.image = UIImage.init(named: metadataInConflict.iconName)
+                if metadata.iconName.count > 0 {
+                    cell.imageFileNew.image = UIImage.init(named: metadata.iconName)
                 } else {
-                    cell.imageFile.image = UIImage.init(named: "file")
+                    cell.imageFileNew.image = UIImage.init(named: "file")
                 }
             }
             
-            // Image New
-            if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, fileNameView: metadata.fileName)) {
-                NCUtility.sharedInstance.loadImage(ocId: metadata.ocId, fileNameView: metadata.fileNameView) { (image) in
+            // Image
+            if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadataInConflict.ocId, fileNameView: metadataInConflict.fileName)) {
+                NCUtility.sharedInstance.loadImage(ocId: metadataInConflict.ocId, fileNameView: metadataInConflict.fileNameView) { (image) in
                     cell.imageFile.image = image
                 }
             } else {
-                if metadata.iconName.count > 0 {
-                    cell.imageFile.image = UIImage.init(named: metadata.iconName)
+                if metadataInConflict.iconName.count > 0 {
+                    cell.imageFile.image = UIImage.init(named: metadataInConflict.iconName)
                 } else {
                     cell.imageFile.image = UIImage.init(named: "file")
                 }
             }
             
-            cell.labelDetail.text = CCUtility.dateDiff(metadata.date as Date) + ", " + CCUtility.transformedSize(metadata.size)
+            cell.labelDetail.text = CCUtility.dateDiff(metadataInConflict.date as Date) + ", " + CCUtility.transformedSize(metadataInConflict.size)
                         
             if metadatasConflictNewFiles.contains(metadata.ocId) {
                 cell.switchNewFile.isOn = true

iOSClient/Main/Create cloud/NCCreateFormUploadConflictCell.xib

@@ -73,8 +73,8 @@
                 </constraints>
             </tableViewCellContentView>
             <connections>
-                <outlet property="imageFile" destination="WSQ-HI-Wkg" id="dPr-RT-mou"/>
-                <outlet property="imageFileNew" destination="Tx2-JG-GGa" id="EVG-EZ-23z"/>
+                <outlet property="imageFile" destination="Tx2-JG-GGa" id="b00-10-AN8"/>
+                <outlet property="imageFileNew" destination="WSQ-HI-Wkg" id="JRg-97-v7V"/>
                 <outlet property="labelDetail" destination="0hq-re-YVn" id="MjI-Yb-xMj"/>
                 <outlet property="labelFileName" destination="Hv8-qJ-lkR" id="g4W-UF-h47"/>
                 <outlet property="switchAlreadyExistingFile" destination="jBi-8r-tc5" id="L0M-zb-k6v"/>