From a82f9e9218551f7aa146ecc38a8194ff53ae5ad9 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 24 Nov 2016 11:43:36 +0100 Subject: [PATCH] Remove setContext of initLiblinphone, it's already did in LinphoneFactory --- src/org/linphone/LinphoneActivity.java | 3 +++ src/org/linphone/LinphoneManager.java | 1 - submodules/linphone | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 6b0cb7aae..ff642f63f 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -1227,6 +1227,9 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta @Override public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { + if (permissions.length <= 0) + return; + int readContactsI = -1; for (int i = 0; i < permissions.length; i++) { Log.i("[Permission] " + permissions[i] + " is " + (grantResults[i] == PackageManager.PERMISSION_GRANTED ? "granted" : "denied")); diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 67b5649b9..1ffd757c9 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -758,7 +758,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag mPrefs.echoConfigurationUpdated(); } - mLc.setContext(mServiceContext); mLc.setZrtpSecretsCache(basePath + "/zrtp_secrets"); try { diff --git a/submodules/linphone b/submodules/linphone index c0b32a738..ef792ae0a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c0b32a738f238c0d87e83ec6eda3d6e0de6bbe51 +Subproject commit ef792ae0ab9acf2ccc224f06f46e22368b9d7848