amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-05 20:10:33 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail): don't render SVG attachments

Browse Source 
Fix #5371
This commit is contained in:
Francis Lachapelle
2021-08-03 16:26:49 -04:00
parent a23fef66ba
commit 40b570cc12
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MailPartViewers/UIxMailPartViewer.m
+11 -6
View File
@@ -249,9 +249,10 @@
_st = [_st lowercaseString];
if ([_mt isEqualToString:@"image"]) {
if ([_st isEqualToString:@"gif"]) return @"gif";
if ([_st isEqualToString:@"jpeg"]) return @"jpg";
if ([_st isEqualToString:@"png"]) return @"png";
if ([_st isEqualToString:@"gif"]) return @"gif";
if ([_st isEqualToString:@"jpeg"]) return @"jpg";
if ([_st isEqualToString:@"png"]) return @"png";
if ([_st isEqualToString:@"svg+xml"]) return @"svg";
}
else if ([_mt isEqualToString:@"text"]) {
if ([_st isEqualToString:@"plain"]) return @"txt";
@@ -260,10 +261,10 @@
if ([_st isEqualToString:@"x-vcard"]) return @"vcf";
}
else if ([_mt isEqualToString:@"message"]) {
if ([_st isEqualToString:@"rfc822"]) return @"eml";
if ([_st isEqualToString:@"rfc822"]) return @"eml";
}
else if ([_mt isEqualToString:@"application"]) {
if ([_st isEqualToString:@"pdf"]) return @"pdf";
if ([_st isEqualToString:@"pdf"]) return @"pdf";
}
return nil;
}
@@ -326,9 +327,13 @@
- (NSString *) _pathForAttachmentOrDownload: (BOOL) forDownload
{
SOGoMailBodyPart *bodyPart;
NSString *s, *attachment;
NSString *st, *s, *attachment;
NSMutableString *url;
st = [[bodyInfo valueForKey:@"subtype"] lowercaseString];
if (!forDownload && [st isEqualToString: @"svg+xml"])
return nil;
bodyPart = [self clientPart];
s = [[self clientObject] baseURLInContext: [self context]];
UI/MailPartViewers/UIxMailRenderingContext.m
+3 -4
View File
@@ -47,8 +47,7 @@
s = [[info objectForKey:@"disposition"] objectForKey: @"type"];
shouldDisplay = (s && ([s caseInsensitiveCompare: @"ATTACHMENT"]
== NSOrderedSame));
shouldDisplay = (s && ([s caseInsensitiveCompare: @"ATTACHMENT"] == NSOrderedSame));
if (!shouldDisplay && !textPart)
shouldDisplay = ([[info objectForKey: @"bodyId"] length] ? YES : NO);
@@ -219,8 +218,8 @@ static BOOL showNamedTextAttachmentsInline = NO;
if ([mt isEqualToString: @"image"] &&
!([st isEqualToString: @"tiff"] || [st isEqualToString: @"pdf"]))
{
if ([self _shouldDisplayAsAttachment: _info textPart: NO])
return [self linkViewer];
if ([self _shouldDisplayAsAttachment: _info textPart: NO] || [st isEqualToString: @"svg+xml"])
return [self linkViewer];
return [self imageViewer];
}