From c5a986c7f8c4bde0231b7cc859f338796e02eae4 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Tue, 11 Feb 2014 15:12:36 +0100 Subject: [PATCH] Use iOS6 methods for AddressBook creation. --- Classes/ContactsTableViewController.m | 2 +- Classes/Utils/FastAddressBook.m | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Classes/ContactsTableViewController.m b/Classes/ContactsTableViewController.m index c424b1ea5..8fb2b7be3 100644 --- a/Classes/ContactsTableViewController.m +++ b/Classes/ContactsTableViewController.m @@ -36,7 +36,7 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf addressBookMap = [[OrderedDictionary alloc] init]; avatarMap = [[NSMutableDictionary alloc] init]; - addressBook = ABAddressBookCreate(); + addressBook = ABAddressBookCreateWithOptions(nil, nil); ABAddressBookRegisterExternalChangeCallback(addressBook, sync_address_book, self); } diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index 2ff38bf6e..e8b52f2d3 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -126,11 +126,8 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf addressBook = nil; } NSError *error = nil; - if(ABAddressBookCreateWithOptions) { - addressBook = ABAddressBookCreateWithOptions(NULL, NULL); - } else { - addressBook = ABAddressBookCreate(); - } + + addressBook = ABAddressBookCreateWithOptions(NULL, NULL); if(addressBook != NULL) { if(ABAddressBookGetAuthorizationStatus) { ABAddressBookRequestAccessWithCompletion(addressBook, ^(bool granted, CFErrorRef error) {