mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-04-27 21:36:21 +00:00
fix crash when creating chat conversation with no contacts
This commit is contained in:
parent
c286b23450
commit
bfa84a37fe
1 changed files with 15 additions and 14 deletions
|
|
@ -67,21 +67,22 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info
|
||||||
NSString *normalizedSipAddress = [FastAddressBook normalizeSipURI:[NSString stringWithUTF8String:uri]];
|
NSString *normalizedSipAddress = [FastAddressBook normalizeSipURI:[NSString stringWithUTF8String:uri]];
|
||||||
contact = [FastAddressBook getContact:normalizedSipAddress];
|
contact = [FastAddressBook getContact:normalizedSipAddress];
|
||||||
ms_free(uri);
|
ms_free(uri);
|
||||||
}
|
|
||||||
if (!contact) {
|
if (!contact) {
|
||||||
LinphoneFriend *friend = linphone_core_find_friend(LC, address);
|
LinphoneFriend *friend = linphone_core_find_friend(LC, address);
|
||||||
MSList *numbers = linphone_friend_get_phone_numbers(friend);
|
MSList *numbers = linphone_friend_get_phone_numbers(friend);
|
||||||
while (numbers) {
|
while (numbers) {
|
||||||
NSString *phone = [NSString stringWithUTF8String:numbers->data];
|
NSString *phone = [NSString stringWithUTF8String:numbers->data];
|
||||||
LinphoneProxyConfig *cfg = linphone_core_get_default_proxy_config(LC);
|
LinphoneProxyConfig *cfg = linphone_core_get_default_proxy_config(LC);
|
||||||
const char *normvalue = linphone_proxy_config_normalize_phone_number(cfg, phone.UTF8String);
|
const char *normvalue = linphone_proxy_config_normalize_phone_number(cfg, phone.UTF8String);
|
||||||
LinphoneAddress *addr = linphone_proxy_config_normalize_sip_uri(cfg, normvalue);
|
LinphoneAddress *addr = linphone_proxy_config_normalize_sip_uri(cfg, normvalue);
|
||||||
const char *phone_addr = linphone_address_as_string_uri_only(addr);
|
const char *phone_addr = linphone_address_as_string_uri_only(addr);
|
||||||
contact = [FastAddressBook getContact:[NSString stringWithUTF8String:phone_addr]];
|
contact = [FastAddressBook getContact:[NSString stringWithUTF8String:phone_addr]];
|
||||||
if (contact) {
|
if (contact) {
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
numbers = numbers->next;
|
||||||
}
|
}
|
||||||
numbers = numbers->next;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return contact;
|
return contact;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue