From cc7c118cc5c43aa7a3ebf49198b540e519fee0d6 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 9 Mar 2017 19:43:52 +0100
Subject: extract stanza-id from muc reflections

---
 .../java/de/pixart/messenger/services/XmppConnectionService.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/services/XmppConnectionService.java')

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index c4570d6c0..f2a6dc308 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -3282,12 +3282,15 @@ public class XmppConnectionService extends Service {
         return null;
     }
 
-    public boolean markMessage(Conversation conversation, String uuid, int status) {
+    public boolean markMessage(Conversation conversation, String uuid, int status, String serverMessageId) {
         if (uuid == null) {
             return false;
         } else {
             Message message = conversation.findSentMessageWithUuid(uuid);
             if (message != null) {
+                if (message.getServerMsgId() == null) {
+                    message.setServerMsgId(serverMessageId);
+                }
                 markMessage(message, status);
                 return true;
             } else {
-- 
cgit v1.2.3