diff options
| -rw-r--r-- | src/eu/siacs/conversations/entities/Message.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java index f36ffa90..2b76773b 100644 --- a/src/eu/siacs/conversations/entities/Message.java +++ b/src/eu/siacs/conversations/entities/Message.java @@ -244,7 +244,7 @@ public class Message extends AbstractEntity { } public void setPresence(String presence) { - if (presence == null || presence.isEmpty()) { + if (presence == null) { this.counterpart = this.counterpart.split("/")[0]; } else { this.counterpart = this.counterpart.split("/")[0] + "/" + presence; @@ -260,7 +260,11 @@ public class Message extends AbstractEntity { if (counterparts.length == 2) { return counterparts[1]; } else { - return null; + if (this.counterpart.contains("/")) { + return ""; + } else { + return null; + } } } |