amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-16 18:58:50 +00:00
Code Issues Projects Releases Wiki Activity

Improve allContactSearch action

Browse Source
This commit is contained in:
Francis Lachapelle
2018-07-06 15:06:55 -04:00
parent 1892aafae4
commit 3ea80065dd
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
UI/Contacts/UIxContactFoldersView.m
View File

@@ -206,10 +206,8 @@ Class SOGoContactSourceFolderK, SOGoGCSFolderK;
for (j = 0; j < [contacts count]; j++)
{
contact = [contacts objectAtIndex: j];
if ([[contact objectForKey: @"emails"] count] == 0)
// Contact must have an email address
continue;
mail = [[[contact objectForKey: @"emails"] objectAtIndex: 0] objectForKey: @"value"];
[contact setObject: [folder displayName]
forKey: @"containerName"];
//NSLog(@" found %@ (%@) ? %@", [contact objectForKey: @"c_name"], mail,
// [contact description]);
if (!excludeLists && [[contact objectForKey: @"c_component"]
@@ -220,10 +218,17 @@ Class SOGoContactSourceFolderK, SOGoGCSFolderK;
[uniqueContacts setObject: contact
forKey: [contact objectForKey: @"c_name"]];
}
else if ([mail length]
&& [uniqueContacts objectForKey: mail] == nil
&& !(excludeGroups && [contact objectForKey: @"isGroup"]))
[uniqueContacts setObject: contact forKey: mail];
else
{
if ([[contact objectForKey: @"emails"] count] == 0)
// Contact must have an email address
continue;
mail = [[[contact objectForKey: @"emails"] objectAtIndex: 0] objectForKey: @"value"];
if ([mail length]
&& [uniqueContacts objectForKey: mail] == nil
&& !(excludeGroups && [contact objectForKey: @"isGroup"]))
[uniqueContacts setObject: contact forKey: mail];
}
}
}
if ([uniqueContacts count] > 0)