fix(mail): use default signature when forcing default identity
parent
d4a0b25c06
commit
dc81f70928
|
@ -30,7 +30,7 @@
|
|||
SOGoMailObject *sourceMail;
|
||||
NSString *field;
|
||||
NSString *currentValue;
|
||||
BOOL htmlComposition;
|
||||
BOOL htmlComposition, forceDefaultIdentity;
|
||||
NSString *signaturePlacement;
|
||||
}
|
||||
|
||||
|
|
|
@ -42,8 +42,8 @@
|
|||
if ((self = [super init]))
|
||||
{
|
||||
ud = [[context activeUser] userDefaults];
|
||||
htmlComposition
|
||||
= [[ud mailComposeMessageType] isEqualToString: @"html"];
|
||||
htmlComposition = [[ud mailComposeMessageType] isEqualToString: @"html"];
|
||||
forceDefaultIdentity = [ud mailForceDefaultIdentity];
|
||||
sourceMail = nil;
|
||||
currentValue = nil;
|
||||
}
|
||||
|
@ -243,13 +243,16 @@
|
|||
NSString *email, *signature, *mailSignature, *nl, *space;
|
||||
int count, max;
|
||||
|
||||
identity = nil;
|
||||
mailSignature = @"";
|
||||
|
||||
if (!forceDefaultIdentity)
|
||||
{
|
||||
fromSentMailbox = [[sourceMail container] isKindOfClass: [SOGoSentFolder class]];
|
||||
if (fromSentMailbox)
|
||||
addresses = [sourceMail fromEnvelopeAddresses];
|
||||
else
|
||||
addresses = [sourceMail toEnvelopeAddresses];
|
||||
identity = nil;
|
||||
mailSignature = @"";
|
||||
max = [addresses count];
|
||||
|
||||
if (max)
|
||||
|
@ -262,6 +265,7 @@
|
|||
identity = [[sourceMail mailAccountFolder] identityForEmail: email];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!identity)
|
||||
{
|
||||
|
|
|
@ -1309,8 +1309,8 @@ static NSArray *reminderValues = nil;
|
|||
[target setObject: identities forKey: @"SOGoMailIdentities"];
|
||||
if ([[account objectForKey: @"forceDefaultIdentity"] boolValue])
|
||||
[target setObject: [NSNumber numberWithBool: YES] forKey: @"SOGoMailForceDefaultIdentity"];
|
||||
else if ([target objectForKey: @"SOGoMailforceDefaultIdentity"])
|
||||
[target removeObjectForKey: @"SOGoMailforceDefaultIdentity"];
|
||||
else if ([target objectForKey: @"SOGoMailForceDefaultIdentity"])
|
||||
[target removeObjectForKey: @"SOGoMailForceDefaultIdentity"];
|
||||
[self _extractMainReceiptsPreferences: [account objectForKey: @"receipts"] inDictionary: target];
|
||||
[self _extractMainSecurityPreferences: [account objectForKey: @"security"] inDictionary: target];
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue