Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui

This commit is contained in:
Yann Diorcet 2012-10-02 12:22:32 +02:00
commit 1fcc5d4ff7
3 changed files with 13 additions and 4 deletions

View file

@ -37,6 +37,7 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
avatarMap = [[NSMutableDictionary alloc] init];
addressBook = ABAddressBookCreate();
ABAddressBookRegisterExternalChangeCallback(addressBook, sync_address_book, self);
}
@ -134,7 +135,7 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
CFRelease(lFirstName);
}
}
CFRelease(lContacts);
if (lContacts) CFRelease(lContacts);
}
[self.tableView reloadData];
}

View file

@ -111,8 +111,16 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
if ((self = [super init]) != nil) {
addressBookMap = [[NSMutableDictionary alloc] init];
addressBook = ABAddressBookCreate();
ABAddressBookRegisterExternalChangeCallback (addressBook, sync_address_book, self);
[self loadData];
ABAddressBookRegisterExternalChangeCallback (addressBook, sync_address_book, self);
if (ABAddressBookGetAuthorizationStatus && ABAddressBookGetAuthorizationStatus() != kABAuthorizationStatusNotDetermined) {
ABAddressBookRequestAccessWithCompletion(addressBook, ^(bool granted, CFErrorRef error) {
if (granted) [self loadData];
});
} else {
[self loadData];
}
}
return self;
}

@ -1 +1 @@
Subproject commit 018d0024de17e4a616256ca5897ac18c24058c94
Subproject commit cbb76acfe36aaa0e79911569e218d77c622fa9d4