From 315e4a0ba346330ca494348ba2f288ec39054114 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 2 Nov 2017 11:04:41 +0100
Subject: [PATCH] Fixed participants list display in chat header

---
 res/values/strings.xml                               | 2 +-
 src/android/org/linphone/chat/GroupChatFragment.java | 4 +++-
 src/android/org/linphone/chat/GroupInfoFragment.java | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f3f5453da..5ae4cf95f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -206,7 +206,7 @@
     <string name="participant_added">%s added</string>
     <string name="participant_removed">%s leaved</string>
     <string name="subject_changed">new subject : %s</string>
-    <string name="admin_set">%s is now admin</string>
+    <string name="admin_set">%s is admin</string>
     <string name="admin_unset">%s is no longer admin</string>
 
     <!-- Status Bar -->
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 3f56ba862..b1393e747 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -744,6 +744,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 
 	@Override
 	public void onParticipantRemoved(ChatRoom cr, EventLog event) {
+		getContactsForParticipants();
 		mEventsAdapter.addToHistory(event);
 	}
 
@@ -759,13 +760,14 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 
 	@Override
 	public void onParticipantAdded(ChatRoom cr, EventLog event) {
+		getContactsForParticipants();
 		mEventsAdapter.addToHistory(event);
 	}
 
 	@Override
 	public void onSubjectChanged(ChatRoom cr, EventLog event) {
-		mEventsAdapter.addToHistory(event);
 		mRoomLabel.setText(event.getSubject());
+		mEventsAdapter.addToHistory(event);
 	}
 
 	@Override
diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java
index 4934d211b..1e3db6dc3 100644
--- a/src/android/org/linphone/chat/GroupInfoFragment.java
+++ b/src/android/org/linphone/chat/GroupInfoFragment.java
@@ -39,6 +39,7 @@ import org.linphone.contacts.ContactAddress;
 import org.linphone.core.Address;
 import org.linphone.core.ChatRoom;
 import org.linphone.core.ChatRoomListenerStub;
+import org.linphone.core.Participant;
 import org.linphone.mediastream.Log;
 
 import java.util.ArrayList;