aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-01-31 14:42:35 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-01-31 14:42:35 +0100
commit2eef37174e1034995d79af03cd1c0a3f8f9f3488 (patch)
tree0ac21c9e2f408ccbf0c264eb0fdf6ec22389be4b /src/main
parent82870b27edfd4813f6fbf48ec8705f87162d62e1 (diff)
fixed false set of subject in conference with empty body tag
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 345e8395..d8eae969 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -454,7 +454,7 @@ public class MessageParser extends AbstractParser implements
mXmppConnectionService.getNotificationService().pushFromBacklog(message);
}
}
- } else { //no body
+ } else if (!packet.hasChild("body")){ //no body
if (isTypeGroupChat) {
Conversation conversation = mXmppConnectionService.find(account, from.toBareJid());
if (packet.hasChild("subject")) {