From 11ad203388ad33a22bd300047745869a27872cd9 Mon Sep 17 00:00:00 2001 From: smizrahi Date: Thu, 9 Nov 2023 14:08:16 +0100 Subject: [PATCH] feat(addressbook): Add global address book autocomplete on vlist --- UI/Contacts/UIxContactsListActions.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UI/Contacts/UIxContactsListActions.m b/UI/Contacts/UIxContactsListActions.m index 43d9b4801..bfe463a23 100644 --- a/UI/Contacts/UIxContactsListActions.m +++ b/UI/Contacts/UIxContactsListActions.m @@ -175,7 +175,7 @@ globalAddressBookResults = nil; for (folder in folders) { // Global AB - if ([folder isKindOfClass: [SOGoContactSourceFolder class]]) { + if ([folder isKindOfClass: [SOGoContactSourceFolder class]] && (![folder isEqual: [self clientObject]])) { tmpGlobalAddressBookResults = [folder lookupContactsWithFilter: valueText onCriteria: nil sortBy: [self sortKey] @@ -193,8 +193,8 @@ if (globalAddressBookResults) { for (i = 0 ; i < [globalAddressBookResults count] ; i++) { tmpDict = [NSMutableDictionary dictionaryWithDictionary: [globalAddressBookResults objectAtIndex: i]]; + // Flatten emails if ([tmpDict objectForKey: @"c_mail"] && [[tmpDict objectForKey: @"c_mail"] isKindOfClass:[NSArray class]] && [[tmpDict objectForKey: @"c_mail"] count] > 0) { - // Flatten emails [tmpDict setObject:[[tmpDict objectForKey: @"c_mail"] componentsJoinedByString: @","] forKey:@"c_mail"]; }