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

fix(mail): Use text/plain fallback if an error occured while parsing html message

Browse Source
This commit is contained in:
smizrahi
2024-02-05 10:50:07 +01:00
parent ce0e650c62
commit f56910db1e
4 changed files with 112 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MailPartViewers/UIxMailPartAlternativeViewer.m
+23 -1
View File
@@ -179,8 +179,9 @@
id info, viewer;
NSArray *parts;
NSMutableArray *renderedParts;
NSString *preferredType;
NSString *preferredType, *htmlNoTags;
NSUInteger i, max;
BOOL fallbackNeeded, hasTextPlain;
if ([self decodedFlatContent])
parts = [[self decodedFlatContent] parts];
@@ -214,6 +215,27 @@
[[self childInfo] objectForKey: @"type"],
[[self childInfo] objectForKey: @"subtype"]];
// Check if the HTML part is good
// If no, try to fallback on text/plain
fallbackNeeded = NO;
hasTextPlain = NO;
for (i = 0 ; i < [renderedParts length] ; i++) {
if ([[[[renderedParts objectAtIndex: i] objectForKey: @"contentType"] lowercaseString] isEqualToString: @"text/html"]
&& [[preferredType lowercaseString] isEqualToString: @"text/html"]) {
if ([[renderedParts objectAtIndex: i] objectForKey:@"exception"]) {
fallbackNeeded = YES;
}
}
if ([[[[renderedParts objectAtIndex: i] objectForKey: @"contentType"] lowercaseString] isEqualToString: @"text/plain"]) {
hasTextPlain = YES;
}
}
if (fallbackNeeded && hasTextPlain) {
preferredType = @"text/plain";
}
return [NSDictionary dictionaryWithObjectsAndKeys:
[self className], @"type",
preferredType, @"preferredPart",