narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

check for query object as condition to trigger deduplication instead of serverId

Browse source
This commit is contained in:
Daniel Gultsch 2015-12-05 18:41:38 +01:00
parent 72b781b845
commit 6358f641e7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -388,7 +388,7 @@ public class MessageParser extends AbstractParser implements
} }
} }
updateLastseen(packet,account,true); updateLastseen(packet,account,true);
boolean checkForDuplicates = serverMsgId != null boolean checkForDuplicates = query != null
|| (isTypeGroupChat && packet.hasChild("delay","urn:xmpp:delay")) || (isTypeGroupChat && packet.hasChild("delay","urn:xmpp:delay"))
|| message.getType() == Message.TYPE_PRIVATE; || message.getType() == Message.TYPE_PRIVATE;
if (checkForDuplicates && conversation.hasDuplicateMessage(message)) { if (checkForDuplicates && conversation.hasDuplicateMessage(message)) {