From 75d7c37331020456d28c9d55607397ca9ba54b27 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 13 Oct 2011 11:57:49 +0200 Subject: [PATCH 1/3] Hide settings menu during calls --- src/org/linphone/LinphoneActivity.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index c7e63a0ef..0cb9efd7f 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -276,6 +276,18 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener menu.findItem(R.id.menu_about).setVisible(useMenuAbout); return true; } + + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); + if (lc == null) + return true; + // hide settings menu when in call + // otherwise, exiting the 'setting' menu will cause exosip deletion/recreation... + menu.findItem(R.id.menu_settings).setVisible(!lc.isIncall()); + + return super.onPrepareOptionsMenu(menu); + } @Override public boolean onOptionsItemSelected(MenuItem item) { From 0ced595b883c9593aec333d18cf601447f63a581 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 13 Oct 2011 11:58:28 +0200 Subject: [PATCH 2/3] Do not apply new settings during a call --- src/org/linphone/LinphonePreferencesActivity.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/org/linphone/LinphonePreferencesActivity.java b/src/org/linphone/LinphonePreferencesActivity.java index f69baa1b9..1745b3404 100644 --- a/src/org/linphone/LinphonePreferencesActivity.java +++ b/src/org/linphone/LinphonePreferencesActivity.java @@ -32,6 +32,7 @@ import java.util.Arrays; import java.util.List; import org.linphone.LinphoneManager.EcCalibrationListener; +import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCoreException; import org.linphone.core.Log; import org.linphone.core.LinphoneCore.EcCalibratorStatus; @@ -229,6 +230,12 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E if (!isFinishing()) return; + LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); + + if (lc != null && (lc.isInComingInvitePending() || lc.isIncall())) { + Log.w("Call in progress => settings not applied"); + return; + } try { LinphoneManager.getInstance().initFromConf(getApplicationContext()); From 0161fa8f548d036a1c2ad4ae2beb0d3cee58d33e Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 13 Oct 2011 12:10:06 +0200 Subject: [PATCH 3/3] Update linphone and msx264 --- submodules/linphone | 2 +- submodules/msx264 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/linphone b/submodules/linphone index 9ea9dcadb..89cb3a385 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9ea9dcadbd06bdc90cffc1e0e95d4e5d1c48fd8e +Subproject commit 89cb3a385b55640604811982f2970187c16883bf diff --git a/submodules/msx264 b/submodules/msx264 index 2e10820e9..b78cec7a5 160000 --- a/submodules/msx264 +++ b/submodules/msx264 @@ -1 +1 @@ -Subproject commit 2e10820e9c32fe75f049308d69e4164b46bc0d1a +Subproject commit b78cec7a59e04aff2a9884feed11addb9000b0ba