mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Contact: update linphone to fix crash when accessing apple sqlite databases (contact, photo)

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2016-05-31 14:25:22 +02:00
parent 1d6f25b546
commit 9feeeee73b
9 changed files with 98 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -25,6 +25,7 @@ Group changes to describe their impact on the project, as follows:
### Fixed
- Fix invalid photo rotation when using Camera for avatars
- Fix self avatar save when using camera
- Parse user input as SIP address or phone number depending on default account settings: if "substitute + by country code" is set,
consider inputs to be phone numbers, otherwise SIP addresses.
- Automatically start call when answering from within notification in iOS9+

4
Classes/Contact.h
View file

@ -28,6 +28,7 @@
- (instancetype)initWithPerson:(ABRecordRef)person;
- (instancetype)initWithFriend:(LinphoneFriend *) friend;
- (void)setAvatar:(UIImage *)avatar;
- (BOOL)setSipAddress:(NSString *)sip atIndex:(NSInteger)index;
- (BOOL)setEmail:(NSString *)email atIndex:(NSInteger)index;
- (BOOL)setPhoneNumber:(NSString *)phone atIndex:(NSInteger)index;
@ -39,4 +40,7 @@
- (BOOL)removeSipAddressAtIndex:(NSInteger)index;
- (BOOL)removePhoneNumberAtIndex:(NSInteger)index;
- (BOOL)removeEmailAtIndex:(NSInteger)index;
- (int)remove;
- (BOOL)save;
@end

86
Classes/Contact.m
View file

@ -47,6 +47,73 @@
_person = nil;
_friend = NULL;
}
#pragma mark - Misc
- (int)remove {
// Remove contact from book
if (_person && ABRecordGetRecordID(_person) != kABRecordInvalidID) {
CFErrorRef error = NULL;
ABAddressBookRef addressBook = ABAddressBookCreateWithOptions(NULL, &error);
if (!addressBook) {
LOGE(@"Cannot retrieve address book");
return -3;
}
ABAddressBookGetAuthorizationStatus();
ABAddressBookRemoveRecord(addressBook, _person, &error);
if (error != NULL) {
LOGE(@"Remove contact %p: Fail(%@)", self, [(__bridge NSError *)error localizedDescription]);
CFRelease(addressBook);
return -3;
} else {
LOGI(@"Remove contact %p: Success!", self);
}
// Save address book
error = NULL;
ABAddressBookSave(addressBook, &error);
_person = nil;
if (error != NULL) {
LOGE(@"Save AddressBook: Fail(%@)", [(__bridge NSError *)error localizedDescription]);
} else {
LOGI(@"Save AddressBook: Success!");
}
CFRelease(addressBook);
return error ? -1 : 0;
}
return -2;
}
- (BOOL)save {
CFErrorRef error = NULL;
ABAddressBookRef addressBook = ABAddressBookCreateWithOptions(NULL, &error);
if (!addressBook) {
LOGE(@"Cannot retrieve address book");
return FALSE;
}
if (ABRecordGetRecordID(_person) == kABRecordInvalidID) {
if (ABAddressBookAddRecord(addressBook, _person, &error)) {
LOGI(@"Add contact %p: Success!", _person);
} else {
LOGE(@"Add contact %p: Fail(%@)", _person, [(__bridge NSError *)error localizedDescription]);
CFRelease(addressBook);
return FALSE;
}
}
// Save address book
error = NULL;
if (ABAddressBookSave(addressBook, &error)) {
LOGI(@"Save AddressBook: Success!");
} else {
LOGE(@"Save AddressBook: Fail(%@)",
error ? [(__bridge NSError *)error localizedDescription] : @"unknown error");
return FALSE;
}
CFRelease(addressBook);
return error == NULL;
}
#pragma mark - Getters
- (UIImage *)avatar:(BOOL)thumbnail {
@ -124,6 +191,25 @@
}
}
- (void)setAvatar:(UIImage *)avatar {
if (_person) {
CFErrorRef error = NULL;
if (!ABPersonRemoveImageData(_person, &error)) {
LOGW(@"Can't remove entry: %@", [(__bridge NSError *)error localizedDescription]);
}
NSData *dataRef = UIImageJPEGRepresentation(avatar, 0.9f);
CFDataRef cfdata = CFDataCreate(NULL, [dataRef bytes], [dataRef length]);
if (!ABPersonSetImageData(_person, cfdata, &error)) {
LOGW(@"Can't add entry: %@", [(__bridge NSError *)error localizedDescription]);
}
CFRelease(cfdata);
} else {
LOGW(@"%s: Cannot do it when using LinphoneFriend, skipping", __FUNCTION__);
}
}
- (BOOL)setSipAddress:(NSString *)sip atIndex:(NSInteger)index {
BOOL ret = FALSE;
if (_person) {

6
Classes/ContactDetailsView.m
View file

@ -61,7 +61,7 @@
- (void)removeContact {
inhibUpdate = TRUE;
[[LinphoneManager.instance fastAddressBook] removeContact:_contact];
[_contact remove];
inhibUpdate = FALSE;
[PhoneMainView.instance popCurrentView];
}
@ -73,7 +73,7 @@
}
// Add contact to book
[LinphoneManager.instance.fastAddressBook saveContact:_contact];
[_contact save];
}
- (void)selectContact:(Contact *)acontact andReload:(BOOL)reload {
@ -312,7 +312,7 @@ static UICompositeViewDescription *compositeDescription = nil;
[VIEW(ImagePickerView).popoverController dismissPopoverAnimated:TRUE];
}
[FastAddressBook setAvatar:image forContact:_contact];
[_contact setAvatar:image];
[_avatarImage setImage:[FastAddressBook imageForContact:_contact thumbnail:NO] bordered:NO withRoundedRadius:YES];
}

4
Classes/ContactsListTableView.m
View file

@ -252,7 +252,7 @@ static int ms_strcmpfuz(const char *fuzzy_word, const char *sentence) {
[tableView deleteSections:[NSIndexSet indexSetWithIndex:indexPath.section]
withRowAnimation:UITableViewRowAnimationFade];
}
[[LinphoneManager.instance fastAddressBook] removeContact:contact];
[contact remove];
[tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath]
withRowAnimation:UITableViewRowAnimationFade];
[tableView endUpdates];
@ -276,7 +276,7 @@ static int ms_strcmpfuz(const char *fuzzy_word, const char *sentence) {
if ([self.tableView numberOfRowsInSection:indexPath.section] == 1) {
[addressBookMap removeObjectForKey:firstChar];
}
[[LinphoneManager.instance fastAddressBook] removeContact:contact];
[contact remove];
[NSNotificationCenter.defaultCenter addObserver:self
selector:@selector(onAddressBookUpdate:)

4
Classes/Utils/FastAddressBook.h
View file

@ -28,9 +28,6 @@
@property(readonly, nonatomic) NSMutableDictionary *addressBookMap;
- (void)reload;
- (void)saveAddressBook;
- (int)removeContact:(Contact *)contact;
- (BOOL)saveContact:(Contact *)contact;
+ (BOOL)isAuthorized;
@ -50,6 +47,5 @@
+ (NSString *)normalizeSipURI:(NSString *)address; // should be removed
+ (NSString *)localizedLabel:(NSString *)label;
+ (void)setAvatar:(UIImage *)avatar forContact:(Contact *)contact;
@end

72
Classes/Utils/FastAddressBook.m
View file

@ -246,76 +246,4 @@ void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info, void
return ret;
}
- (int)removeContact:(Contact *)contact {
// Remove contact from book
if (contact.person && ABRecordGetRecordID(contact.person) != kABRecordInvalidID) {
CFErrorRef error = NULL;
ABAddressBookRemoveRecord(addressBook, contact.person, (CFErrorRef *)&error);
if (error != NULL) {
LOGE(@"Remove contact %p: Fail(%@)", contact, [(__bridge NSError *)error localizedDescription]);
} else {
LOGI(@"Remove contact %p: Success!", contact);
}
contact = NULL;
// Save address book
error = NULL;
ABAddressBookSave(addressBook, (CFErrorRef *)&error);
// TODO: stop reloading the whole address book but just clear the removed entries!
[self loadData];
if (error != NULL) {
LOGE(@"Save AddressBook: Fail(%@)", [(__bridge NSError *)error localizedDescription]);
} else {
LOGI(@"Save AddressBook: Success!");
}
return error ? -1 : 0;
}
return -2;
}
- (BOOL)saveContact:(Contact *)contact {
CFErrorRef error = NULL;
if (ABRecordGetRecordID(contact.person) == kABRecordInvalidID) {
if (ABAddressBookAddRecord(addressBook, contact.person, (CFErrorRef *)&error)) {
LOGI(@"Add contact %p: Success!", contact.person);
} else {
LOGE(@"Add contact %p: Fail(%@)", contact.person, [(__bridge NSError *)error localizedDescription]);
return FALSE;
}
}
// Save address book
error = NULL;
if (ABAddressBookSave(addressBook, &error)) {
LOGI(@"Save AddressBook: Success!");
} else {
LOGE(@"Save AddressBook: Fail(%@)", [(__bridge NSError *)error localizedDescription]);
return FALSE;
}
[self reload];
return error == NULL;
}
+ (void)setAvatar:(UIImage *)avatar forContact:(Contact *)contact {
FastAddressBook *fab = LinphoneManager.instance.fastAddressBook;
CFErrorRef error = NULL;
if (!ABPersonRemoveImageData(contact.person, (CFErrorRef *)&error)) {
LOGI(@"Can't remove entry: %@", [(__bridge NSError *)error localizedDescription]);
}
NSData *dataRef = UIImageJPEGRepresentation(avatar, 0.9f);
CFDataRef cfdata = CFDataCreate(NULL, [dataRef bytes], [dataRef length]);
[fab saveAddressBook];
if (!ABPersonSetImageData(contact.person, cfdata, (CFErrorRef *)&error)) {
LOGI(@"Can't add entry: %@", [(__bridge NSError *)error localizedDescription]);
} else {
[fab saveAddressBook];
}
CFRelease(cfdata);
}
@end

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit 4a4f51f455f5d1b344b17b97388fb359ac8517ed
Subproject commit b08d4cedd0153aa3dbe8a672bf6e8be5f09b2f19

2
submodules/linphone

@ -1 +1 @@
Subproject commit e4c674c2e3887063aa2c73163c748acccd5fd12b
Subproject commit 6574a95fd755216b8b91616772cdf4f986214cc6