aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 44cda261..65a8f9e6 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -245,6 +245,10 @@ public class MessageParser extends AbstractParser implements
return null;
}
}
+ if (message.hasChild("x","http://jabber.org/protocol/muc#user")
+ && "chat".equals(message.getAttribute("type"))) {
+ return null;
+ }
Conversation conversation = mXmppConnectionService
.findOrCreateConversation(account, fullJid.toBareJid(), false);
String pgpBody = getPgpBody(message);
@@ -482,7 +486,6 @@ public class MessageParser extends AbstractParser implements
public void onMessagePacketReceived(Account account, MessagePacket packet) {
Message message = null;
this.parseNick(packet, account);
-
if ((packet.getType() == MessagePacket.TYPE_CHAT || packet.getType() == MessagePacket.TYPE_NORMAL)) {
if ((packet.getBody() != null)
&& (packet.getBody().startsWith("?OTR"))) {
@@ -490,9 +493,7 @@ public class MessageParser extends AbstractParser implements
if (message != null) {
message.markUnread();
}
- } else if (packet.hasChild("body")
- && !(packet.hasChild("x",
- "http://jabber.org/protocol/muc#user"))) {
+ } else if (packet.hasChild("body")) {
message = this.parseChat(packet, account);
if (message != null) {
message.markUnread();