From eb9e9883611f5f5c0c2bd7466e434794ab074c22 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Sun, 9 Nov 2014 18:24:01 +0100 Subject: fixed muc sender history for some cases (where the previous nick was a valid jid) --- .../java/eu/siacs/conversations/ui/ConversationFragment.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java') diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index cb7988cb..5d133e87 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -280,10 +280,11 @@ public class ConversationFragment extends Fragment { if (message.getStatus() <= Message.STATUS_RECEIVED) { if (message.getConversation().getMode() == Conversation.MODE_MULTI) { if (message.getCounterpart() != null) { - highlightInConference(message.getCounterpart().getResourcepart()); - } else { - highlightInConference(message - .getContact().getDisplayName()); + if (!message.getCounterpart().getResourcepart().isEmpty()) { + highlightInConference(message.getCounterpart().getResourcepart()); + } else { + highlightInConference(message.getCounterpart().toString()); + } } } else { Contact contact = message.getConversation() -- cgit v1.2.3