From ee09b80fc37f51907606e6e3c516b3ebad9cfece Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 2 Apr 2014 10:15:59 -0400 Subject: [PATCH] Simplify [UIxContactEditor addressBookDisplayName] We were trying to translate the default address book name to the user's language, but the method [SOGoContactFolders defaultFolderName] is already returning a translated string, making the whole logic useless. --- UI/Contacts/UIxContactEditor.m | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m index 8179c51d2..82ad1941e 100644 --- a/UI/Contacts/UIxContactEditor.m +++ b/UI/Contacts/UIxContactEditor.m @@ -219,17 +219,7 @@ static Class SOGoContactGCSEntryK = Nil; - (NSString *) addressBookDisplayName { - NSString *fDisplayName; - SOGoObject *folder; - SOGoContactFolders *parentFolder; - - fDisplayName = [addressBookItem displayName]; - folder = [[self clientObject] container]; - parentFolder = [folder container]; - if ([fDisplayName isEqualToString: [parentFolder defaultFolderName]]) - fDisplayName = [self labelForKey: fDisplayName]; - - return fDisplayName; + return [addressBookItem displayName]; } - (BOOL) supportCategories