amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-23 02:44:18 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail): Disable inline images in attachments when HTML emails writing is disabled. Fixes #5877.

Browse Source
This commit is contained in:
smizrahi
2024-01-22 09:40:10 +01:00
parent 9e3e3b2291
commit 0d0eda2698
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Mailer/SOGoDraftObject.m
+13 -11
View File
@@ -1059,13 +1059,13 @@ static NSString *userAgent = nil;
- (void) fetchMailForReplying: (SOGoMailObject *) sourceMail
toAll: (BOOL) toAll
{
BOOL fromSentMailbox;
BOOL fromSentMailbox, shouldRetrieveAttachements;
NSString *msgID;
NSString *oldReferences;
NSMutableDictionary *info;
NGImap4Envelope *sourceEnvelope;
SOGoUserDefaults *ud;
fromSentMailbox = [[sourceMail container] isKindOfClass: [SOGoSentFolder class]];
[sourceMail fetchCoreInfos];
@@ -1089,6 +1089,7 @@ static NSString *userAgent = nil;
ud = [[context activeUser] userDefaults];
[self setText: [sourceMail contentForReply]];
[self setHeaders: info];
@@ -1098,16 +1099,17 @@ static NSString *userAgent = nil;
[self setSourceIMAP4ID: [[sourceMail nameInContainer] intValue]];
[self setSourceFolderWithMailObject: sourceMail];
ud = [[context activeUser] userDefaults];
[self setText: [sourceMail contentForReply]];
if ([sourceMail isEncrypted])
[self _fetchAttachmentsFromEncryptedMail: sourceMail onlyImages: YES];
else if ([sourceMail isOpaqueSigned])
[self _fetchAttachmentsFromOpaqueSignedMail: sourceMail onlyImages: YES];
else
[self _fetchAttachmentsFromMail: sourceMail onlyImages: YES];
shouldRetrieveAttachements = [[ud mailComposeMessageType] isEqualToString: @"html"];
if (shouldRetrieveAttachements) {
if ([sourceMail isEncrypted])
[self _fetchAttachmentsFromEncryptedMail: sourceMail onlyImages: YES];
else if ([sourceMail isOpaqueSigned])
[self _fetchAttachmentsFromOpaqueSignedMail: sourceMail onlyImages: YES];
else
[self _fetchAttachmentsFromMail: sourceMail onlyImages: YES];
}
[self save];