From a5f8439a9386dab36450c600cc8f91a628164a6a Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Tue, 19 Aug 2014 11:17:58 +0200 Subject: [PATCH] Restore incall view when click on menu icon --- src/org/linphone/LinphoneActivity.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 48a3b081d..4d7bd4157 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -154,7 +154,7 @@ public class LinphoneActivity extends FragmentActivity implements startActivityForResult(new Intent().setClass(this, SetupActivity.class), FIRST_LOGIN_ACTIVITY); } } - + setContentView(R.layout.main); instance = this; fragmentsHistory = new ArrayList(); @@ -1272,6 +1272,12 @@ public class LinphoneActivity extends FragmentActivity implements LinphoneCall.State callState = call.getState(); if (callState == State.IncomingReceived) { startActivity(new Intent(this, IncomingCallActivity.class)); + } else { + if (call.getCurrentParamsCopy().getVideoEnabled()) { + startVideoActivity(call); + } else { + startIncallActivity(call); + } } } }