sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #505 from betheg/fix_invite 

fixed muc invite with <body/>.
This commit is contained in:
Daniel Gultsch 2014-09-30 11:53:07 +02:00
parent 511b7a53f4 c8160b010d
commit 0733a94127
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/eu/siacs/conversations/parser/MessageParser.java
View File

@ -404,7 +404,9 @@ public class MessageParser extends AbstractParser implements
if (message != null) { if (message != null) {
message.markUnread(); 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); message = this.parseChat(packet, account);
if (message != null) { if (message != null) {
message.markUnread(); message.markUnread();