amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-19 21:53:19 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail): pick proper "from" address when replying/forwarding

Browse Source 
Fixes #5056
This commit is contained in:
Francis Lachapelle
2020-07-06 12:43:55 -04:00
parent 089935297c
commit c99170b9bc
7 changed files with 173 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MailerUI/UIxMailAccountActions.m
+41 -20
View File
@@ -50,6 +50,7 @@
#import <Mailer/SOGoDraftObject.h>
#import <Mailer/SOGoDraftsFolder.h>
#import <SOGo/NSArray+Utilities.h>
#import <SOGo/NSDictionary+Utilities.h>
#import <SOGo/NSObject+Utilities.h>
#import <SOGo/NSString+Utilities.h>
#import <SOGo/SOGoDomainDefaults.h>
@@ -98,19 +99,34 @@
/* compose */
- (NSString *) _emailFromIdentity: (NSDictionary *) identity
{
NSString *fullName, *format;
fullName = [identity objectForKey: @"fullName"];
if ([fullName length])
format = @"%{fullName} <%{email}>";
else
format = @"%{email}";
return [identity keysWithFormat: format];
}
- (WOResponse *) composeAction
{
BOOL save, isHTML;
NSDictionary *data, *identity;
NSMutableDictionary *headers;
NSString *accountName, *mailboxName, *messageName;
NSString *value, *signature, *nl, *space;
SOGoDraftObject *newDraftMessage;
NSMutableDictionary *headers;
NSDictionary *data;
NSString *accountName, *mailboxName, *messageName;
SOGoDraftsFolder *drafts;
SOGoMailAccount *co;
SOGoUserDefaults *ud;
id mailTo;
BOOL save, isHTML;
drafts = [[self clientObject] draftsFolderInContext: context];
co = [self clientObject];
drafts = [co draftsFolderInContext: context];
newDraftMessage = [drafts newDraft];
headers = [NSMutableDictionary dictionary];
@@ -134,25 +150,30 @@
save = YES;
}
if (save)
[newDraftMessage setHeaders: headers];
signature = [[self clientObject] signature];
if ([signature length])
identity = [co defaultIdentity];
if (identity)
{
ud = [[context activeUser] userDefaults];
[newDraftMessage setIsHTML: [[ud mailComposeMessageType] isEqualToString: @"html"]];
isHTML = [newDraftMessage isHTML];
nl = (isHTML? @"<br />" : @"\n");
space = (isHTML ? @"&nbsp;" : @" ");
[newDraftMessage setText: [NSString stringWithFormat: @"%@%@--%@%@%@", nl, nl, space, nl, signature]];
[headers setObject: [self _emailFromIdentity: identity] forKey: @"from"];
signature = [identity objectForKey: @"signature"];
if ([signature length])
{
ud = [[context activeUser] userDefaults];
[newDraftMessage setIsHTML: [[ud mailComposeMessageType] isEqualToString: @"html"]];
isHTML = [newDraftMessage isHTML];
nl = (isHTML? @"<br />" : @"\n");
space = (isHTML ? @"&nbsp;" : @" ");
[newDraftMessage setText: [NSString stringWithFormat: @"%@%@--%@%@%@", nl, nl, space, nl, signature]];
}
save = YES;
}
if (save)
[newDraftMessage storeInfo];
accountName = [[self clientObject] nameInContainer];
if (save)
{
[newDraftMessage setHeaders: headers];
[newDraftMessage storeInfo];
}
accountName = [co nameInContainer];
mailboxName = [drafts absoluteImap4Name]; // Ex: /INBOX/Drafts/
mailboxName = [mailboxName substringWithRange: NSMakeRange(1, [mailboxName length] -2)];
messageName = [newDraftMessage nameInContainer];