From 06ea167ee58c65f54cf4474927d977513d380b3b Mon Sep 17 00:00:00 2001 From: smizrahi Date: Mon, 18 Mar 2024 15:13:37 +0100 Subject: [PATCH] fix(mail): Removed bracket display when inline text or inline html --- UI/MailerUI/UIxMailListActions.m | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/UI/MailerUI/UIxMailListActions.m b/UI/MailerUI/UIxMailListActions.m index df44ce960..3008cf19f 100644 --- a/UI/MailerUI/UIxMailListActions.m +++ b/UI/MailerUI/UIxMailListActions.m @@ -340,20 +340,17 @@ && [[currentPart objectForKey:@"disposition"] objectForKey:@"type"] && [[[[currentPart objectForKey:@"disposition"] objectForKey:@"type"] uppercaseString] isEqualToString:@"INLINE"]; isImage = [SOGoMailBodyPart bodyPartClassForMimeType: [contentType lowercaseString] inContext: [self context]] == [SOGoImageMailBodyPart class]; + id foo = [SOGoMailBodyPart bodyPartClassForMimeType: [contentType lowercaseString] inContext: [self context]]; + if (![ud hideInlineAttachments] || ([ud hideInlineAttachments] && !(isInline && isImage))) { - BOOL a = [currentPart objectForKey:@"disposition"] ; - BOOL b = [[[currentPart objectForKey:@"disposition"] allKeys] length] > 0 ; - BOOL c = [currentPart objectForKey:@"parameterList"] ; - BOOL d = [[currentPart objectForKey:@"parameterList"] objectForKey:@"name"]; - BOOL foo = ([currentPart objectForKey:@"parameterList"] - && [[currentPart objectForKey:@"parameterList"] objectForKey:@"name"] - ); - hasAttachment = (([currentPart objectForKey:@"disposition"] + hasAttachment = ((([currentPart objectForKey:@"disposition"] && [[[currentPart objectForKey:@"disposition"] allKeys] length] > 0) || ([currentPart objectForKey:@"parameterList"] && [[currentPart objectForKey:@"parameterList"] objectForKey:@"name"] - )); + )) + && !(isInline && contentType && [[contentType lowercaseString] isEqualToString:@"text/plain"]) + && !(isInline && contentType && [[contentType lowercaseString] isEqualToString:@"text/html"])); } } else if ([currentPart objectForKey:@"parts"]) { hasAttachment = [self parseParts: [currentPart objectForKey:@"parts"] hasAttachment: hasAttachment];