diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-06-15 12:44:29 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-19 20:02:11 +0200 |
| commit | 0435f9278047dae73f1502e30c9978ce91ef9e96 (patch) | |
| tree | dca655fd0e38c5f9c520a9f22e167e9cc5a256b1 /src/main/java/eu/siacs/conversations/entities | |
| parent | d12a57cbb362d6158c7b4c5f70074b3c829308ea (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 8cff7b959..c3294f774 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -788,7 +788,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 3c871dc79..f38875e6e 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -376,7 +376,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) { |