diff options
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 2 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 5d133e87..d2ba6f51 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -280,7 +280,7 @@ public class ConversationFragment extends Fragment { if (message.getStatus() <= Message.STATUS_RECEIVED) { if (message.getConversation().getMode() == Conversation.MODE_MULTI) { if (message.getCounterpart() != null) { - if (!message.getCounterpart().getResourcepart().isEmpty()) { + if (!message.getCounterpart().isBareJid()) { highlightInConference(message.getCounterpart().getResourcepart()); } else { highlightInConference(message.getCounterpart().toString()); diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 16239ec8..3ebb9390 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -304,7 +304,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { private String getDisplayedMucCounterpart(final Jid counterpart) { if (counterpart==null) { return ""; - } else if (!counterpart.getResourcepart().isEmpty()) { + } else if (!counterpart.isBareJid()) { return counterpart.getResourcepart(); } else { return counterpart.toString(); |