From 0d1fb872be54ac030f15071c5b9439559a9d2037 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 20 Oct 2017 15:04:18 +0200 Subject: [PATCH] Display group chat icon and subject for group rooms --- .../org/linphone/chat/ChatListFragment.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/android/org/linphone/chat/ChatListFragment.java b/src/android/org/linphone/chat/ChatListFragment.java index 47c611e31..2df8b672b 100644 --- a/src/android/org/linphone/chat/ChatListFragment.java +++ b/src/android/org/linphone/chat/ChatListFragment.java @@ -423,7 +423,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte ChatMessage[] history = chatRoom.getHistory(1); ChatMessage msg = history[0]; - if(msg.getFileTransferInformation() != null || msg.getExternalBodyUrl() != null || msg.getAppdata() != null ){ + if (msg.getFileTransferInformation() != null || msg.getExternalBodyUrl() != null || msg.getAppdata() != null) { holder.lastMessageView.setBackgroundResource(R.drawable.chat_file_message); time = msg.getTime(); holder.date.setText(LinphoneUtils.timestampToHumanDate(getActivity(),time,getString(R.string.messages_list_date_format))); @@ -437,13 +437,17 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte } holder.displayName.setSelected(true); // For animation - holder.displayName.setText(contact == null ? LinphoneUtils.getAddressDisplayName(address) : contact.getFullName()); - - - if (contact != null) { - LinphoneUtils.setThumbnailPictureFromUri(LinphoneActivity.instance(), holder.contactPicture, contact.getThumbnailUri()); + if (chatRoom.canHandleParticipants()) { + holder.displayName.setText(chatRoom.getSubject()); + holder.contactPicture.setImageResource(R.drawable.chat_group_avatar); } else { - holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); + if (contact != null) { + holder.displayName.setText(contact.getFullName()); + LinphoneUtils.setThumbnailPictureFromUri(LinphoneActivity.instance(), holder.contactPicture, contact.getThumbnailUri()); + } else { + holder.displayName.setText(LinphoneUtils.getAddressDisplayName(address)); + holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); + } } if (unreadMessagesCount > 0) { @@ -482,7 +486,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte } } }); - if(chatList.isItemChecked(position)) { + if (chatList.isItemChecked(position)) { holder.select.setChecked(true); } else { holder.select.setChecked(false);