deduplicate every message with a stanza-id from the server

Daniel Gultsch created 9 years ago

Change summary

src/main/java/eu/siacs/conversations/parser/MessageParser.java | 6 ++--
1 file changed, 3 insertions(+), 3 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/parser/MessageParser.java

@@ -532,9 +532,9 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 				return;
 			}
 
-			boolean checkForDuplicates = query != null
-					|| (isTypeGroupChat && packet.hasChild("delay","urn:xmpp:delay"))
-					|| message.getType() == Message.TYPE_PRIVATE;
+			boolean checkForDuplicates = (isTypeGroupChat && packet.hasChild("delay","urn:xmpp:delay"))
+					|| message.getType() == Message.TYPE_PRIVATE
+					|| message.getServerMsgId() != null;
 			if (checkForDuplicates && conversation.hasDuplicateMessage(message)) {
 				Log.d(Config.LOGTAG,"skipping duplicate message from "+message.getCounterpart().toString()+" "+message.getBody());
 				return;