From f8c354c302b34b1676764a869481f8a6160f6120 Mon Sep 17 00:00:00 2001 From: smizrahi Date: Wed, 10 Apr 2024 17:18:03 +0200 Subject: [PATCH] fix(mail): Fix Exception when using delegated identities. Closes #5951 --- SoObjects/SOGo/SOGoUser.h | 1 + SoObjects/SOGo/SOGoUser.m | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/SoObjects/SOGo/SOGoUser.h b/SoObjects/SOGo/SOGoUser.h index 7460837ac0..1b329a83ed 100644 --- a/SoObjects/SOGo/SOGoUser.h +++ b/SoObjects/SOGo/SOGoUser.h @@ -115,6 +115,7 @@ - (NSArray *) mailAccounts; - (NSArray *) mailAccountsNoRawHtmlSignature; - (NSArray *) mailAccountsWithDelegatedIdentities: (BOOL) appendDeletegatedIdentities; +- (NSArray *)mailAccountsWithDelegatedIdentities:(BOOL)appendDeletegatedIdentities forceRawHtmlSignature:(BOOL)forceRawHtmlSignature; - (NSDictionary *) accountWithName: (NSString *) accountName; - (NSArray *) allIdentities; - (NSDictionary *) primaryIdentity; diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m index f7047bacc3..9eed753578 100644 --- a/SoObjects/SOGo/SOGoUser.m +++ b/SoObjects/SOGo/SOGoUser.m @@ -1034,6 +1034,11 @@ - (NSArray *) mailAccountsNoRawHtmlSignature return [self mailAccountsWithDelegatedIdentities: YES forceRawHtmlSignature: NO]; } +- (NSArray *) mailAccountsWithDelegatedIdentities: (BOOL) appendDeletegatedIdentities +{ + return [self mailAccountsWithDelegatedIdentities: appendDeletegatedIdentities forceRawHtmlSignature: [[self domainDefaults] forceRawHtmlSignature]]; +} + - (NSArray *) mailAccountsWithDelegatedIdentities: (BOOL) appendDeletegatedIdentities forceRawHtmlSignature: (BOOL) forceRawHtmlSignature { NSArray *auxAccounts;