amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-18 04:55:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix rendering of forwarded HTML message with img

Browse Source 
Fixes #3981 (partially)
This commit is contained in:
Francis Lachapelle
2017-01-11 16:08:05 -05:00
parent 589827a414
commit e5d0b0b0ca
7 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
UI/MailPartViewers/UIxMailPartHTMLViewer.m
View File

@@ -609,8 +609,7 @@ static NSData* _sanitizeContent(NSData *theData)
value = [_attributes valueAtIndex: count];
if ([value hasPrefix: @"cid:"])
{
cid = [NSString stringWithFormat: @"<%@>",
[value substringFromIndex: 4]];
cid = [value substringFromIndex: 4];
value = [attachmentIds objectForKey: cid];
skipAttribute = (value == nil);
}
@@ -920,7 +919,7 @@ static NSData* _sanitizeContent(NSData *theData)
createXMLReaderForMimeType: @"text/html"];
handler = [_UIxHTMLMailContentHandler new];
[handler setAttachmentIds: [mail fetchFileAttachmentIds]];
[handler setAttachmentIds: attachmentIds];
// We check if we got an unsupported charset. If so
// we convert everything to UTF-16{LE,BE} so it passes
@@ -1047,7 +1046,7 @@ static NSData* _sanitizeContent(NSData *theData)
encoding = @"us-ascii";
handler = [_UIxHTMLMailContentHandler new];
[handler setAttachmentIds: [mail fetchFileAttachmentIds]];
[handler setAttachmentIds: attachmentIds];
// We check if we got an unsupported charset. If so
// we convert everything to UTF-16{LE,BE} so it passes