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

fix(mail): Correct attachment handling when creating emails from templates

Browse Source
This commit is contained in:
smizrahi
2024-11-06 16:48:39 +01:00
parent 5bab72726a
commit 617c1bbc64
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Mailer/SOGoDraftObject.m
+2 -3
View File
@@ -993,7 +993,6 @@ static NSString *userAgent = nil;
[self _fileAttachmentsFromPart: [m body] onlyImages: onlyImages];
}
//
//
//
@@ -1022,7 +1021,7 @@ static NSString *userAgent = nil;
addresses = [NSMutableArray array];
[self _addEMailsOfAddresses: [sourceEnvelope from] toArray: addresses];
if ([addresses count])
if ([addresses count] > 0)
[info setObject: [addresses objectAtIndex: 0] forKey: @"from"];
addresses = [NSMutableArray array];
[self _addEMailsOfAddresses: [sourceEnvelope to] toArray: addresses];
@@ -1038,7 +1037,7 @@ static NSString *userAgent = nil;
addresses = [NSMutableArray array];
[self _addEMailsOfAddresses: [sourceEnvelope replyTo] toArray: addresses];
if ([addresses count] > 0)
[info setObject: addresses forKey: @"replyTo"];
[info setObject: [addresses objectAtIndex: 0] forKey: @"replyTo"];
h = [sourceMail mailHeaders];
priority = [h objectForKey: @"x-priority"];
UI/MailerUI/UIxMailActions.m
+2
View File
@@ -132,6 +132,8 @@
drafts = [account draftsFolderInContext: context];
newMail = [drafts newDraft];
[newMail fetchMailForEditing: co];
if ([co isInTemplatesFolder])
[newMail save];
[newMail storeInfo];
accountName = [account nameInContainer];