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

Fix issue where user can't resume a call when two calls are paused at the same time

Browse source
This commit is contained in:
Sylvain Berfini 2013-01-11 10:34:48 +01:00
parent a40ce25b42
commit 97210e2ec1
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/org/linphone/InCallActivity.java
View file

@ -360,7 +360,7 @@ public class InCallActivity extends FragmentActivity implements
else if (id == R.id.callStatus) { else if (id == R.id.callStatus) {
LinphoneCall call = (LinphoneCall) v.getTag(); LinphoneCall call = (LinphoneCall) v.getTag();
pauseOrResumeCall(call, true); pauseOrResumeCall(call);
} }
else if (id == R.id.conferenceStatus) { else if (id == R.id.conferenceStatus) {
pauseOrResumeConference(); pauseOrResumeConference();
@ -484,10 +484,10 @@ public class InCallActivity extends FragmentActivity implements
private void pauseOrResumeCall() { private void pauseOrResumeCall() {
LinphoneCore lc = LinphoneManager.getLc(); LinphoneCore lc = LinphoneManager.getLc();
LinphoneCall call = lc.getCurrentCall(); LinphoneCall call = lc.getCurrentCall();
pauseOrResumeCall(call, false); pauseOrResumeCall(call);
} }
public void pauseOrResumeCall(LinphoneCall call, boolean leaveConference) { public void pauseOrResumeCall(LinphoneCall call) {
LinphoneCore lc = LinphoneManager.getLc(); LinphoneCore lc = LinphoneManager.getLc();
if (call != null && LinphoneUtils.isCallRunning(call)) { if (call != null && LinphoneUtils.isCallRunning(call)) {
if (call.isInConference()) { if (call.isInConference()) {
@ -515,6 +515,13 @@ public class InCallActivity extends FragmentActivity implements
} }
pause.setImageResource(R.drawable.pause_off); pause.setImageResource(R.drawable.pause_off);
} }
} else if (call != null) {
lc.resumeCall(call);
if (isVideoCallPaused) {
isVideoCallPaused = false;
showVideoView();
}
pause.setImageResource(R.drawable.pause_off);
} }
} }
} }