From 34352e8af5c0d6ac8adf90273ae0070743b4883a Mon Sep 17 00:00:00 2001 From: Brieuc Viel Date: Tue, 6 Mar 2018 16:36:02 +0100 Subject: [PATCH] [FastAddressBook] update registerAddrsFor cleaned-up --- Classes/Utils/FastAddressBook.m | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index 9b6ec51a1..22c02c021 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -209,25 +209,22 @@ } - (void)registerAddrsFor:(Contact *)contact { + if(!_addressBookMap) + return; Contact* mContact = contact; - for (NSString *phone in mContact.phones) { - char *normalizedPhone = linphone_proxy_config_normalize_phone_number(linphone_core_get_default_proxy_config(LC), phone.UTF8String); - NSString *name = [FastAddressBook normalizeSipURI:normalizedPhone ? [NSString stringWithUTF8String:normalizedPhone] : phone]; - if (phone != NULL) { - if(_addressBookMap){ - if(mContact){ - [_addressBookMap setObject:mContact forKey:(name ?: [FastAddressBook localizedLabel:phone])]; - }else{ - // Dosomte - } - } - } + for (NSString *phone in mContact.phones) { + char *normalizedPhone = linphone_proxy_config_normalize_phone_number(linphone_core_get_default_proxy_config(LC), phone.UTF8String); + NSString *name = [FastAddressBook normalizeSipURI:normalizedPhone ? [NSString stringWithUTF8String:normalizedPhone] : phone]; + if (phone != NULL) { + if(mContact) + [_addressBookMap setObject:mContact forKey:(name ?: [FastAddressBook localizedLabel:phone])]; if (normalizedPhone) ms_free(normalizedPhone); } - for (NSString *sip in mContact.sipAddresses) { - [_addressBookMap setObject:mContact forKey:([FastAddressBook normalizeSipURI:sip] ?: sip)]; - } + } + for (NSString *sip in mContact.sipAddresses) { + [_addressBookMap setObject:mContact forKey:([FastAddressBook normalizeSipURI:sip] ?: sip)]; + } } #pragma mark - Tools