aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-12-05 18:41:38 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-12-05 18:41:38 +0100
commit6358f641e7acbc5b02a3b7a46289dd4baed63fcf (patch)
tree3885272ea704de80690dc80d308e0b4e20111f2d /src/main
parent72b781b845925ff02fe76ae39f9a84876422a1ed (diff)
check for query object as condition to trigger deduplication instead of serverId
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 137cd4561..6baefac54 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -388,7 +388,7 @@ public class MessageParser extends AbstractParser implements
}
}
updateLastseen(packet,account,true);
- boolean checkForDuplicates = serverMsgId != null
+ boolean checkForDuplicates = query != null
|| (isTypeGroupChat && packet.hasChild("delay","urn:xmpp:delay"))
|| message.getType() == Message.TYPE_PRIVATE;
if (checkForDuplicates && conversation.hasDuplicateMessage(message)) {