delay notification until after pgp decryption

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) {