From c86bf1e99018380d97237367131e99150a25ceb0 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Mon, 9 Nov 2015 14:46:22 +0100
Subject: [PATCH] Fix chat in call and in call view

---
 res/layout/chat.xml                | 11 +++++++++++
 src/org/linphone/CallActivity.java |  6 ------
 src/org/linphone/ChatFragment.java | 18 +++++++++++++++++-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index 538f5d7fd..ebd3bc687 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -41,6 +41,17 @@
 			android:layout_height="match_parent"
 			android:padding="15dp"/>
 
+		<ImageView
+			android:id="@+id/back_to_call"
+			android:src="@drawable/call_back"
+			android:background="@drawable/toolbar_button"
+			android:contentDescription="@string/content_description_call"
+			android:layout_toLeftOf="@id/edit"
+			android:layout_width="70dp"
+			android:layout_height="match_parent"
+			android:visibility="gone"
+			android:padding="15dp"/>
+
 		<TextView
 			android:id="@+id/contact_name"
 			style="@style/font6"
diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java
index 57b7572d9..6354fadc0 100644
--- a/src/org/linphone/CallActivity.java
+++ b/src/org/linphone/CallActivity.java
@@ -1464,14 +1464,8 @@ public class CallActivity extends Activity implements OnClickListener {
 
 	//CALL INFORMATION
 	private void displayCurrentCall(LinphoneCall call){
-		//if(!isVideoEnabled(call)){
-		//	mActiveCallHeader.setVisibility(View.VISIBLE);
-		//	mNoCurrentCall.setVisibility(View.GONE);
-		//}
-
 		LinphoneAddress lAddress = call.getRemoteAddress();
 		TextView contactName = (TextView) findViewById(R.id.current_contact_name);
-
 		setContactInformation(contactName, contactPicture, lAddress);
 		registerCallDurationTimer(null, call);
 	}
diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index fb3396d7d..8e49bc652 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -113,7 +113,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 	private EditText message;
 	private ImageView cancelUpload, edit, selectAll, deselectAll, startCall, delete, sendImage, sendMessage, cancel;
 	private TextView contactName, remoteComposing;
-	private ImageView back;
+	private ImageView back, backToCall;
 	private AutoCompleteTextView searchContactField;
 	private RelativeLayout uploadLayout, textLayout, topBar, editList;
 	private ListView messagesList;
@@ -182,6 +182,9 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 		startCall = (ImageView) view.findViewById(R.id.start_call);
 		startCall.setOnClickListener(this);
 
+		backToCall = (ImageView) view.findViewById(R.id.back_to_call);
+		backToCall.setOnClickListener(this);
+
 		selectAll = (ImageView) view.findViewById(R.id.select_all);
 		selectAll.setOnClickListener(this);
 
@@ -585,6 +588,14 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 			LinphoneActivity.instance().hideTabBar(false);
 		}
 
+		if(LinphoneManager.getLc().isIncall()){
+			backToCall.setVisibility(View.VISIBLE);
+			startCall.setVisibility(View.INVISIBLE);
+		} else {
+			backToCall.setVisibility(View.INVISIBLE);
+			startCall.setVisibility(View.VISIBLE);
+		}
+
 		LinphoneAddress lAddress;
 		try {
 			lAddress = LinphoneCoreFactory.instance().createLinphoneAddress(sipUri);
@@ -642,6 +653,11 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 	public void onClick(View v) {
 		int id = v.getId();
 
+		if (id == R.id.back_to_call) {
+			LinphoneActivity.instance().resetClassicMenuLayoutAndGoBackToCallIfStillRunning();
+			return;
+		}
+
 		if (id == R.id.select_all) {
 			deselectAll.setVisibility(View.VISIBLE);
 			selectAll.setVisibility(View.GONE);