From 0660db7bf65aba9092cef7edc84a352bec4d7e5c Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 1 Dec 2015 11:41:18 -0500 Subject: [PATCH] (fix) reverted change for #3389 --- SoObjects/Contacts/SOGoContactSourceFolder.m | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.m b/SoObjects/Contacts/SOGoContactSourceFolder.m index 1375c74dc..abf71093e 100644 --- a/SoObjects/Contacts/SOGoContactSourceFolder.m +++ b/SoObjects/Contacts/SOGoContactSourceFolder.m @@ -231,15 +231,8 @@ NSObject *recordSource; newRecord = [NSMutableDictionary dictionaryWithCapacity: 8]; - - // We set the c_uid only for authentication sources. SOGoUserSources set - // with canAuthenticate = NO and isAddressBook = YES have absolutely *NO REASON* - // to have entries with a c_uid. These can collide with real uids. - if ([[[[SOGoUserManager sharedUserManager] metadataForSourceID: [source sourceID]] objectForKey: @"canAuthenticate"] boolValue]) - { - [newRecord setObject: [oldRecord objectForKey: @"c_uid"] - forKey: @"c_uid"]; - } + [newRecord setObject: [oldRecord objectForKey: @"c_uid"] + forKey: @"c_uid"]; // c_name => id [newRecord setObject: [oldRecord objectForKey: @"c_name"]