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

don't take stanza-id into account when deduping muc pms

Browse source
This commit is contained in:
Daniel Gultsch 2016-07-14 09:01:15 +02:00
parent 27690865a6
commit 223d50c1a0
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/entities/Message.java
View file

@ -378,7 +378,7 @@ public class Message extends AbstractEntity {
} }
public boolean similar(Message message) { public boolean similar(Message message) {
if (this.serverMsgId != null && message.getServerMsgId() != null) { if (type != TYPE_PRIVATE && this.serverMsgId != null && message.getServerMsgId() != null) {
return this.serverMsgId.equals(message.getServerMsgId()); return this.serverMsgId.equals(message.getServerMsgId());
} else if (this.body == null || this.counterpart == null) { } else if (this.body == null || this.counterpart == null) {
return false; return false;