aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-11-09 07:20:08 -0500
committerSam Whited <sam@samwhited.com>2014-11-09 07:20:08 -0500
commit7cfcf10f487a6b97231508963807039443da16f2 (patch)
tree660adaebe6b0319ab7a924eb7908461a1074814a /src/main
parentfc594e9b7302893f8ff0b27ae9db9a2f815a539a (diff)
Fix contact highlighting in MUC
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java4
1 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 299f06c05..58e29d300 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -280,10 +280,10 @@ public class ConversationFragment extends Fragment {
if (message.getStatus() <= Message.STATUS_RECEIVED) {
if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
if (message.getPresence() != null) {
- highlightInConference(message.getPresence().toString());
+ highlightInConference(message.getPresence().getResourcepart());
} else {
highlightInConference(message
- .getCounterpart().toString());
+ .getContact().getDisplayName());
}
} else {
Contact contact = message.getConversation()