diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-06-15 12:44:29 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-06-15 12:44:29 +0200 |
commit | 5f40a7042dc939be05b54501fdcb949302ad11c2 (patch) | |
tree | 792b5d0c0bbe066c27f62bf7216517d2fed9be0c /src/main/java/eu/siacs/conversations/entities | |
parent | e0575642b5c3189fd83e411c5ce11bb6c0a43f21 (diff) |
delay notification until after pgp decryption
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 94502d24..a94d008e 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -774,7 +774,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl public boolean hasDuplicateMessage(Message message) { synchronized (this.messages) { for (int i = this.messages.size() - 1; i >= 0; --i) { - if (this.messages.get(i).equals(message)) { + if (this.messages.get(i).similar(message)) { return true; } } diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 21837386..4fcfdbf0 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 { this.transferable = transferable; } - public boolean equals(Message message) { + public boolean similar(Message message) { if (this.serverMsgId != null && message.getServerMsgId() != null) { return this.serverMsgId.equals(message.getServerMsgId()); } else if (this.body == null || this.counterpart == null) { |