From c4a81663cfb8a8869e06bf8ad8f0eff906b5d823 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Mon, 28 Nov 2011 19:56:05 +0100 Subject: [PATCH] Start incall act. from incoming call act. --- src/org/linphone/IncomingCallActivity.java | 2 ++ src/org/linphone/LinphoneActivity.java | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java index eaf25f8c0..8e7b43399 100644 --- a/src/org/linphone/IncomingCallActivity.java +++ b/src/org/linphone/IncomingCallActivity.java @@ -140,6 +140,8 @@ public class IncomingCallActivity extends Activity implements LinphoneOnCallStat if (!LinphoneManager.getInstance().acceptCall(mCall)) { // the above method takes care of Samsung Galaxy S Toast.makeText(this, R.string.couldnt_accept_call, Toast.LENGTH_LONG); + } else { + LinphoneActivity.instance().startIncallActivity(); } } @Override diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 58d442a07..ffe96b430 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -492,11 +492,6 @@ public class LinphoneActivity extends TabActivity implements stopOrientationSensor(); finishActivity(INCOMING_CALL_ACTIVITY); } - if (state==State.Connected) { - if (call.getDirection() == CallDirection.Incoming) { - startIncallActivity(); - } - } if (state == LinphoneCall.State.StreamsRunning && Version.isVideoCapable() && !call.isInConference()) { boolean videoEnabled = call.getCurrentParamsCopy().getVideoEnabled(); if (videoEnabled) {