moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-08-13 15:53:48 -04:00
Code Issues Releases Wiki Activity

show contacts name in non anonymous mucs. fixes #1213

Browse Source
This commit is contained in:
Daniel Gultsch 2015-07-05 18:10:18 +02:00
parent bef731a3c8
commit ef1429c9a6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/utils/UIHelper.java
View File

@ -221,10 +221,14 @@ public class UIHelper {
public static String getMessageDisplayName(final Message message) { public static String getMessageDisplayName(final Message message) {
if (message.getStatus() == Message.STATUS_RECEIVED) { if (message.getStatus() == Message.STATUS_RECEIVED) {
final Contact contact = message.getContact();
if (message.getConversation().getMode() == Conversation.MODE_MULTI) { if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
return getDisplayedMucCounterpart(message.getCounterpart()); if (contact != null) {
return contact.getDisplayName();
} else {
return getDisplayedMucCounterpart(message.getCounterpart());
}
} else { } else {
final Contact contact = message.getContact();
return contact != null ? contact.getDisplayName() : ""; return contact != null ? contact.getDisplayName() : "";
} }
} else { } else {