From a9cb1807e6a2478256c095d03b0255d5a108e3ba Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 12 Jan 2018 10:16:20 +0100
Subject: [PATCH] Fix for chat room creation from call

---
 src/android/org/linphone/chat/GroupChatFragment.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 265670115..79fe34ef4 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -364,8 +364,13 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 			//TODO error
 			return;
 		}
-
-		mChatRoom = core.getChatRoomFromUri(mRemoteSipAddress.asString());
+		Address proxyConfigContact = lc.getDefaultProxyConfig().getContact();
+		if (proxyConfigContact != null) {
+			mChatRoom = lc.findOneToOneChatRoom(proxyConfigContact, mRemoteSipAddress);
+		}
+		if (mChatRoom == null) {
+			mChatRoom = core.getChatRoomFromUri(mRemoteSipAddress.asStringUriOnly());
+		}
 		mChatRoom.setListener(this);
 		mChatRoom.markAsRead();
 		LinphoneActivity.instance().updateMissedChatCount();