Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update linphone submodule + Use new createFriend method

Browse source
This commit is contained in:
Erwan Croze 2016-11-25 16:04:21 +01:00
parent d5ee50b1f1
commit cb10aa43c1
3 changed files with 76 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.linphone" package="org.linphone"
android:versionCode="3213" android:versionName="3.2.1" android:installLocation="auto"> android:versionCode="3214" android:versionName="3.2.1" android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23"/> <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23"/>
<!-- Permissions for Push Notification --> <!-- Permissions for Push Notification -->

4
src/org/linphone/LinphoneContact.java
View file

@ -458,7 +458,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
private void createOrUpdateFriend() { private void createOrUpdateFriend() {
if (!isLinphoneFriend()) { if (!isLinphoneFriend()) {
friend = LinphoneCoreFactory.instance().createLinphoneFriend(); friend = LinphoneManager.getLc().createFriend();
friend.enableSubscribes(false); friend.enableSubscribes(false);
friend.setIncSubscribePolicy(SubscribePolicy.SPDeny); friend.setIncSubscribePolicy(SubscribePolicy.SPDeny);
if (isAndroidContact()) { if (isAndroidContact()) {
@ -772,7 +772,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
private static LinphoneContact createLinphoneFriend() { private static LinphoneContact createLinphoneFriend() {
LinphoneContact contact = new LinphoneContact(); LinphoneContact contact = new LinphoneContact();
LinphoneFriend friend = LinphoneCoreFactory.instance().createLinphoneFriend(); LinphoneFriend friend = LinphoneManager.getLc().createFriend();
// Disable subscribes for now // Disable subscribes for now
friend.enableSubscribes(false); friend.enableSubscribes(false);
friend.setIncSubscribePolicy(SubscribePolicy.SPDeny); friend.setIncSubscribePolicy(SubscribePolicy.SPDeny);

2
submodules/linphone

@ -1 +1 @@
Subproject commit 1b8f370bc785ef64eb23e1cb45f509c9b98aab85 Subproject commit a87a9ecd454616d04baa9e04e9e1ffa9ff36c375