From 4abf12b4bb27cfafdb3cc725f677e8f66fe5709e Mon Sep 17 00:00:00 2001 From: smizrahi Date: Mon, 11 Sep 2023 11:56:10 +0200 Subject: [PATCH] fix(preferences): Signature could not be saved when SOGoCreateIdentitiesDisabled is set to YES and no signature is on identity --- UI/PreferencesUI/UIxPreferences.m | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index 643a9f825..997d62451 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -1410,10 +1410,14 @@ 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"]; - if ([identity objectForKey:@"signature"]) { + if (newIdentitiesAsDict + && [newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] + && [[newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] objectForKey:@"signature"]) { [identity setObject: [[newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] objectForKey:@"signature"] forKey: @"signature"]; } - if ([[newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] objectForKey:@"isDefault"]) { + if (newIdentitiesAsDict + && [newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] + && [[newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] objectForKey:@"isDefault"]) { [identity setObject: [NSNumber numberWithBool: YES] forKey: @"isDefault"]; } else { [identity setObject: [NSNumber numberWithBool: NO] forKey: @"isDefault"];