From b2c0ad48c3e0e3ec86c816a672797ce6c1b0b237 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Thu, 4 May 2017 14:53:47 +0200
Subject: [PATCH] Fix UI in chat

---
 src/android/org/linphone/ChatFragment.java | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/android/org/linphone/ChatFragment.java b/src/android/org/linphone/ChatFragment.java
index 7287faa8b..6bb690ad5 100644
--- a/src/android/org/linphone/ChatFragment.java
+++ b/src/android/org/linphone/ChatFragment.java
@@ -527,16 +527,6 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 			LinphoneActivity.instance().selectMenu(FragmentsAvailable.CHAT);
 		}
 
-		if(LinphoneManager.getLc().isIncall()){
-			backToCall.setVisibility(View.VISIBLE);
-			startCall.setVisibility(View.GONE);
-		} else {
-			if(!newChatConversation) {
-				backToCall.setVisibility(View.GONE);
-				startCall.setVisibility(View.VISIBLE);
-			}
-		}
-
 		LinphoneManager.addListener(this);
 
 		// Force hide keyboard
@@ -548,9 +538,20 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 		if (contact != null) {
 			contactName.setText(contact.getFullName());
 			sipUri = getArguments().getString("sipUriDraft");
+			newChatConversation = false;
 			getArguments().clear();
 		}
 
+		if(LinphoneManager.getLc().isIncall()){
+			backToCall.setVisibility(View.VISIBLE);
+			startCall.setVisibility(View.GONE);
+		} else {
+			if(!newChatConversation) {
+				backToCall.setVisibility(View.GONE);
+				startCall.setVisibility(View.VISIBLE);
+			}
+		}
+
 		if (!newChatConversation || contact != null) {
 			initChatRoom(sipUri);
 			searchContactField.setVisibility(View.GONE);