aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu
diff options
context:
space:
mode:
authorMichael <betheg@bitcloner.org>2014-09-29 17:59:53 +0200
committerMichael <betheg@bitcloner.org>2014-09-29 17:59:53 +0200
commitc8160b010d70aea41d4b6e00ed58563d6c195b1d (patch)
tree9aaa07f78fb0a8c2dcb05b60b9b10d2b77bddaf6 /src/eu
parent1ae9338fc9d5f8e1f6505445f07f4476efd8f139 (diff)
fixed muc invite with <body/>.
Diffstat (limited to 'src/eu')
-rw-r--r--src/eu/siacs/conversations/parser/MessageParser.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index 9e2ccd92..27627e52 100644
--- a/src/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/eu/siacs/conversations/parser/MessageParser.java
@@ -399,7 +399,9 @@ public class MessageParser extends AbstractParser implements
if (message != null) {
message.markUnread();
}
- } else if (packet.hasChild("body")) {
+ } else if (packet.hasChild("body")
+ && !(packet.hasChild("x",
+ "http://jabber.org/protocol/muc#user"))) {
message = this.parseChat(packet, account);
if (message != null) {
message.markUnread();