From deaeb795d3dca902e22f26ff3ee5295aea7bbd64 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Wed, 17 Oct 2012 15:25:40 +0200 Subject: [PATCH] Fix Addressbook when no proxy configured --- Classes/LinphoneCoreSettingsStore.m | 1 + Classes/Utils/FastAddressBook.m | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index f4254ecbf..1eb1715f1 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -382,6 +382,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); linphone_core_set_default_proxy(lc,proxyCfg); } + [[[LinphoneManager instance] fastAddressBook] reload]; } - (BOOL)synchronize { diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index bb22a149d..ab5f0b1a3 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -188,7 +188,11 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf if(add) { CFStringRef lValue = CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); NSString* lNormalizedKey = [FastAddressBook normalizeSipURI:(NSString*)lValue]; - [addressBookMap setObject:lPerson forKey:lNormalizedKey]; + if(lNormalizedKey != NULL) { + [addressBookMap setObject:lPerson forKey:lNormalizedKey]; + } else { + [addressBookMap setObject:lPerson forKey:(NSString*)lValue]; + } } CFRelease(lDict); }