aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-07-14 09:01:15 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-07-14 09:01:15 +0200
commit223d50c1a01e89fd76dfab77e15e6eee00796236 (patch)
treed8eacfeca335edd34d366c38d4fb52c3b557b28b
parent27690865a63e1c1f349f876619df78c867c8f9af (diff)
don't take stanza-id into account when deduping muc pms
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Message.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 4fcfdbf0..9ab1da96 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -378,7 +378,7 @@ public class Message extends AbstractEntity {
}
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());
} else if (this.body == null || this.counterpart == null) {
return false;