From 21ce3d2d1ae18aa130999fb965c1e64a901ac7d6 Mon Sep 17 00:00:00 2001 From: Christian S Date: Sun, 5 Jul 2015 18:18:57 +0200 Subject: correct MUC nicknames --- src/main/java/eu/siacs/conversations/utils/UIHelper.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/utils/UIHelper.java') diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index b918c0834..c44593615 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -221,15 +221,14 @@ public class UIHelper { public static String getMessageDisplayName(final Message message) { if (message.getStatus() == Message.STATUS_RECEIVED) { + final Contact contact = message.getContact(); if (message.getConversation().getMode() == Conversation.MODE_MULTI) { - final Contact contact = message.getContact(); - if (message.getContact() != null) { - return contact != null ? contact.getDisplayName() : ""; + if (contact != null) { + return contact.getDisplayName(); } else { return getDisplayedMucCounterpart(message.getCounterpart()); } } else { - final Contact contact = message.getContact(); return contact != null ? contact.getDisplayName() : ""; } } else { @@ -262,4 +261,4 @@ public class UIHelper { body = body.replace("?","").replace("¿",""); return LOCATION_QUESTIONS.contains(body); } -} +} \ No newline at end of file -- cgit v1.2.3