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

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

Browse source 
Conflicts:
	submodules/linphone
This commit is contained in:
Guillaume Beraudo 2011-10-13 13:21:54 +02:00
commit cf47af9385
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/org/linphone/LinphoneActivity.java
View file

@ -276,6 +276,18 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
menu.findItem(R.id.menu_about).setVisible(useMenuAbout); menu.findItem(R.id.menu_about).setVisible(useMenuAbout);
return true; 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 @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {

7
src/org/linphone/LinphonePreferencesActivity.java
View file

@ -32,6 +32,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import org.linphone.LinphoneManager.EcCalibrationListener; import org.linphone.LinphoneManager.EcCalibrationListener;
import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreException;
import org.linphone.core.Log; import org.linphone.core.Log;
import org.linphone.core.LinphoneCore.EcCalibratorStatus; import org.linphone.core.LinphoneCore.EcCalibratorStatus;
@ -229,6 +230,12 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E
if (!isFinishing()) return; if (!isFinishing()) return;
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
if (lc != null && (lc.isInComingInvitePending() || lc.isIncall())) {
Log.w("Call in progress => settings not applied");
return;
}
try { try {
LinphoneManager.getInstance().initFromConf(getApplicationContext()); LinphoneManager.getInstance().initFromConf(getApplicationContext());

2
submodules/msx264

@ -1 +1 @@
Subproject commit 2e10820e9c32fe75f049308d69e4164b46bc0d1a Subproject commit b78cec7a59e04aff2a9884feed11addb9000b0ba