MAM: update previously sent messages with server msg id during mam query

1 files changed, 7 insertions, 3 deletions

diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index 030cf9664..3df78fde0 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -839,15 +839,19 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         return this.bookmark;
     }
 
-    public boolean hasDuplicateMessage(Message message) {
+    public Message findDuplicateMessage(Message message) {
         synchronized (this.messages) {
             for (int i = this.messages.size() - 1; i >= 0; --i) {
                 if (this.messages.get(i).similar(message)) {
-                    return true;
+                    return this.messages.get(i);
                 }
             }
         }
-        return false;
+        return null;
+    }
+
+    public boolean hasDuplicateMessage(Message message) {
+        return findDuplicateMessage(message) != null;
     }
 
     public Message findSentMessageWithBody(String body) {