mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-03 20:46:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git.linphone.org:linphone-iphone

Browse source
This commit is contained in:
REIS Benjamin 2016-09-16 13:59:31 +02:00
commit 5da8a28120
5 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/Contact.m
View file

@ -58,6 +58,8 @@
#endif
}
if (_friend) {
linphone_friend_enable_subscribes(_friend, FALSE);
linphone_friend_set_inc_subscribe_policy(_friend, LinphoneSPDeny);
linphone_core_add_friend(LC, _friend);
}
}

2
Classes/ContactDetailsView.m
View file

@ -121,6 +121,8 @@
- (void)newContact:(NSString *)address {
[self selectContact:[[Contact alloc] initWithPerson:ABPersonCreate()] andReload:NO];
[self addCurrentContactContactField:address];
// force to restart server subscription to add new contact into the list
[LinphoneManager.instance becomeActive];
}
- (void)editContact:(Contact *)acontact {

2
submodules/belcard

@ -1 +1 @@
Subproject commit aef96d7dc07a1ab2563ecdc225e20a9ae8d67547
Subproject commit 7ed3a4fbbacf8159865de7def1e3ca891b0f70ac

2
submodules/belr

@ -1 +1 @@
Subproject commit 253af89ec2ef34c50349235f6c18ca496aed7dc8
Subproject commit 7de31a427206079fd715dc6f427b675471e65fd7

2
submodules/linphone

@ -1 +1 @@
Subproject commit e6032177a82a4c0c8c8f88b60d42a7e7e5c56e33
Subproject commit 268de5e752d8db39896cc3fbcf3772b79b1972db