dev

iOSClient/Main/CCMain.m

@@ -4659,7 +4659,9 @@
                 cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folder"] color:[NCBrandColor sharedInstance].brandElement];
             
         } else {
-            cell.file.image = [UIImage imageNamed:metadata.iconName];
+            if (metadata.iconName.length > 0) {
+                cell.file.image = [UIImage imageNamed:metadata.iconName];
+            }
         }
         if (metadata.thumbnailExists && _metadataFolder.e2eEncrypted == NO)
             [[CCActions sharedInstance] downloadTumbnail:metadata delegate:self];

iOSClient/Networking/CCNetworking.m

@@ -736,6 +736,7 @@
                     imageData = UIImageJPEGRepresentation(image, 1.0);
                     NSString *fileNameJPEG = [[metadata.fileName lastPathComponent] stringByDeletingPathExtension];
                     metadata.fileName = [fileNameJPEG stringByAppendingString:@".jpg"];
+                    metadata.fileNameView = metadata.fileName;
                     
                     [imageData writeToFile:[CCUtility getDirectoryProviderStorageFileID:metadata.fileID fileNameView:metadata.fileName] options:NSDataWritingAtomic error:&error];