From df49bc736f37468be7491b01a46e81f62c376877 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 30 Jun 2016 16:48:48 +0200 Subject: [PATCH] Update linphone --- src/org/linphone/LinphoneManager.java | 4 +--- src/org/linphone/assistant/AssistantActivity.java | 4 ++++ submodules/linphone | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 50e1250a7..d397904e8 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -249,8 +249,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag progress.dismiss(); progress = null; LinphoneManager.getLc().reloadMsPlugins(null); - if (ohcodec.getUserDataSize() > box - && ohcodec.getUserData(box) != null) + if (ohcodec.getUserDataSize() > box && ohcodec.getUserData(box) != null) ((CheckBoxPreference)ohcodec.getUserData(box)).setSummary(mCodecDownloader.getLicenseMessage()); } } @@ -259,7 +258,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag @Override public void OnError (final String error){ - if (progress == null) return; mHandler.post(new Runnable() { @Override public void run() { diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java index 66adb80ca..fb72b6173 100644 --- a/src/org/linphone/assistant/AssistantActivity.java +++ b/src/org/linphone/assistant/AssistantActivity.java @@ -242,7 +242,11 @@ private static AssistantActivity instance; if (requestCode == PERMISSIONS_REQUEST_RECORD_AUDIO) { if (getPackageManager().checkPermission(Manifest.permission.RECORD_AUDIO, getPackageName()) == PackageManager.PERMISSION_GRANTED) { launchEchoCancellerCalibration(true); + } else { + isEchoCalibrationFinished(); } + } else { + isEchoCalibrationFinished(); } } diff --git a/submodules/linphone b/submodules/linphone index 171ada8a3..9c5174e0b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 171ada8a3215767b94f419a5445e02a6144d079a +Subproject commit 9c5174e0bbce4afb955589d4a0bb63bbacf3d873