aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-07-14 09:01:15 +0200
committerChristian Schneppe <christian@pix-art.de>2016-07-14 21:01:25 +0200
commit7565568c6a8964306bee680b8a3d1c6f0a6fe347 (patch)
tree57024b59e2fa9587fd899661f6d1529301b60086 /src/main/java/eu/siacs/conversations/entities
parente7df193da667b038a5ac65fb6806106b75ec43e4 (diff)
don't take stanza-id into account when deduping muc pms
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
-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 f38875e6e..357af7643 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -377,7 +377,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;