Merge branch 'master' into sogo-5.8

This commit is contained in:
smizrahi
2023-05-16 10:34:19 +02:00
+3 -1
View File
@@ -1385,7 +1385,9 @@ static NSArray *reminderValues = nil;
for (identity in previousIdentities) {
if ([newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]]) {
[identity setObject: [[newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] objectForKey:@"fullName"] forKey: @"fullName"];
[identity setObject: [[newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] objectForKey:@"signature"] forKey: @"signature"];
if ([identity objectForKey:@"signature"]) {
[identity setObject: [[newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] objectForKey:@"signature"] forKey: @"signature"];
}
if ([[newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] objectForKey:@"isDefault"]) {
[identity setObject: [NSNumber numberWithBool: YES] forKey: @"isDefault"];
} else {