diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-09-30 11:53:07 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-09-30 11:53:07 +0200 |
| commit | 0733a941276fbb976c3b0d0b40f724b2cfd34e31 (patch) | |
| tree | 19ba1af55c2845f0e3baf2f308a61bcf426f8678 /src/eu | |
| parent | 511b7a53f41f8254449e6c2c6eff795f728e7a33 (diff) | |
| parent | c8160b010d70aea41d4b6e00ed58563d6c195b1d (diff) | |
Merge pull request #505 from betheg/fix_invite
fixed muc invite with <body/>.
Diffstat (limited to 'src/eu')
| -rw-r--r-- | src/eu/siacs/conversations/parser/MessageParser.java | 4 |
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 af0c96e9..c8718edb 100644 --- a/src/eu/siacs/conversations/parser/MessageParser.java +++ b/src/eu/siacs/conversations/parser/MessageParser.java @@ -404,7 +404,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(); |