Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed 1-1 secure chat room display in chat rooms list

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-02 14:21:27 +01:00
parent 2586a2dcfc
commit a404543789
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/android/org/linphone/chat/ChatRoomViewHolder.java
View file

@ -40,6 +40,7 @@ import org.linphone.core.ChatMessage;
import org.linphone.core.ChatRoom; import org.linphone.core.ChatRoom;
import org.linphone.core.ChatRoomCapabilities; import org.linphone.core.ChatRoomCapabilities;
import org.linphone.core.Content; import org.linphone.core.Content;
import org.linphone.core.Participant;
import org.linphone.ui.ContactAvatar; import org.linphone.ui.ContactAvatar;
public class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener { public class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
@ -155,7 +156,15 @@ public class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.
public void getAvatar(ChatRoom mRoom) { public void getAvatar(ChatRoom mRoom) {
if (mRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) { if (mRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
LinphoneContact contact = ContactsManager.getInstance().findContactFromAddress(mRoom.getPeerAddress()); LinphoneContact contact = null;
if (mRoom.hasCapability(ChatRoomCapabilities.Basic.toInt())) {
contact = ContactsManager.getInstance().findContactFromAddress(mRoom.getPeerAddress());
} else {
Participant[] participants = mRoom.getParticipants();
if (participants != null && participants.length > 0) {
contact = ContactsManager.getInstance().findContactFromAddress(participants[0].getAddress());
}
}
if (contact != null) { if (contact != null) {
if (mRoom.hasCapability(ChatRoomCapabilities.Encrypted.toInt())) { if (mRoom.hasCapability(ChatRoomCapabilities.Encrypted.toInt())) {
ContactAvatar.displayAvatar(contact, mRoom.getSecurityLevel(), avatarLayout); ContactAvatar.displayAvatar(contact, mRoom.getSecurityLevel(), avatarLayout);