diff options
author | Christian S <kriztan@users.noreply.github.com> | 2016-03-20 18:52:46 +0100 |
---|---|---|
committer | Christian S <kriztan@users.noreply.github.com> | 2016-03-20 18:52:46 +0100 |
commit | a72d94c40584e7ca7a0a3ffacca8424ac0ad600f (patch) | |
tree | 76a4707750256450c8c203cd38f101b73434c821 /src/main/java/eu/siacs/conversations/utils | |
parent | bfa1b020f874c5e45833ba004e59c81743d32c2d (diff) | |
parent | 135c8567a566e2c12f98a578dcd606dfdf2b06bb (diff) |
Merge pull request #80 from siacs/master
copy commits
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils')
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/UIHelper.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index 8cae81171..add3d80cb 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -225,9 +225,10 @@ public class UIHelper { } public static String getMessageDisplayName(final Message message) { + final Conversation conversation = message.getConversation(); if (message.getStatus() == Message.STATUS_RECEIVED) { final Contact contact = message.getContact(); - if (message.getConversation().getMode() == Conversation.MODE_MULTI) { + if (conversation.getMode() == Conversation.MODE_MULTI) { if (contact != null) { return contact.getDisplayName(); } else { @@ -237,10 +238,10 @@ public class UIHelper { return contact != null ? contact.getDisplayName() : ""; } } else { - if (message.getConversation().getMode() == Conversation.MODE_MULTI) { - return getDisplayedMucCounterpart(message.getConversation().getJid()); + if (conversation.getMode() == Conversation.MODE_MULTI) { + return conversation.getMucOptions().getSelf().getName(); } else { - final Jid jid = message.getConversation().getAccount().getJid(); + final Jid jid = conversation.getAccount().getJid(); return jid.hasLocalpart() ? jid.getLocalpart() : jid.toDomainJid().toString(); } } |