aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-11-07 09:14:37 -0500
committerSam Whited <sam@samwhited.com>2014-11-09 07:00:40 -0500
commitefa4cec24df7c91e6d57a0f06c970e8193faabf9 (patch)
tree8fc0cc79fc53463ed238f48decbd217c63e2b237 /src/main/java/eu/siacs
parentdd426ca6de3b764f8c748486b15220b42504930e (diff)
More formatting fixes in MUC
Diffstat (limited to 'src/main/java/eu/siacs')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java6
1 files changed, 5 insertions, 1 deletions
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 17253cff..5975f0f8 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -149,7 +149,11 @@ public class MessageAdapter extends ArrayAdapter<Message> {
info = contact.getDisplayName();
} else {
if (message.getPresence() != null) {
- info = message.getPresence().getResourcepart();
+ if (message.getPresence().isBareJid()) {
+ info = message.getPresence().toString();
+ } else {
+ info = message.getPresence().getResourcepart();
+ }
} else {
info = message.getCounterpart().toString();
}