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

Blink of incall controls fixed

Browse source
This commit is contained in:
Sylvain Berfini 2012-05-29 16:04:46 +02:00
parent cae1d3bd2e
commit 29109e32c8
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/org/linphone/DialerActivity.java
View file

@ -523,8 +523,8 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
if (AndroidCameraConfiguration.hasSeveralCameras() && mSwitchCamera != null) if (AndroidCameraConfiguration.hasSeveralCameras() && mSwitchCamera != null)
mSwitchCamera.setVisibility(View.VISIBLE); mSwitchCamera.setVisibility(View.VISIBLE);
boolean isInCall = LinphoneManager.getLc().isIncall(); boolean callEstablished = isCallEstablished();
isInCall = isInCall || LinphoneManager.getLc().getCallsNb() > 0; boolean isInCall = LinphoneManager.getLc().getCallsNb() > 1 || (LinphoneManager.getLc().getCallsNb() == 1 && callEstablished);
if (mVideoCaptureView != null && mCamera == null && !LinphoneManager.getLc().isIncall()) { if (mVideoCaptureView != null && mCamera == null && !LinphoneManager.getLc().isIncall()) {
mCamera = Camera.open(mCurrentCameraId); mCamera = Camera.open(mCurrentCameraId);
@ -541,6 +541,23 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
} }
} }
private boolean isCallEstablished()
{
LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
if (call == null)
return false;
LinphoneCall.State state = call.getState();
return state == LinphoneCall.State.Connected ||
state == LinphoneCall.State.CallUpdated ||
state == LinphoneCall.State.CallUpdatedByRemote ||
state == LinphoneCall.State.Paused ||
state == LinphoneCall.State.PausedByRemote ||
state == LinphoneCall.State.StreamsRunning ||
state == LinphoneCall.State.Pausing ||
state == LinphoneCall.State.Resuming;
}
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {