Generate a better room message for media

Mainly, set originId to fix ChatSecure#523 (isDuplicate returned false for MAM catchup, because of this)
zom · Feb 9, 2018 · 06432f2 · 06432f2
1 parent bd79464
commit 06432f2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/ChatSecure/Classes/Controllers/FileTransferManager.swift b/ChatSecure/Classes/Controllers/FileTransferManager.swift
@@ -428,13 +428,14 @@ public class FileTransferManager: NSObject, OTRServerCapabilitiesDelegate {
             message.messageSecurityInfo = OTRMessageEncryptionInfo(messageSecurity: security)
             return message
         } else if let room = thread as? OTRXMPPRoom {
-            let message = OTRXMPPRoomMessage()!
-            message.messageDate = Date()
-            message.roomUniqueId = room.threadIdentifier
-            message.roomJID = room.jid
-            message.senderJID = room.ownJID
-            message.state = .needsSending
-            message.mediaItemId = mediaItem.uniqueId
+            var message:OTRXMPPRoomMessage? = nil
+            self.connection.read({ (transaction) in
+                message = room.outgoingMessage(withText: "", transaction: transaction) as? OTRXMPPRoomMessage
+            })
+            if let message = message {
+                message.messageText = nil
+                message.mediaItemId = mediaItem.uniqueId
+            }
             return message
         }
         return nil

diff --git a/ChatSecure/Classes/Controllers/XMPP/Storage/RoomStorage.swift b/ChatSecure/Classes/Controllers/XMPP/Storage/RoomStorage.swift
@@ -72,6 +72,11 @@ import YapDatabase
             // TODO unify this with the non-MUC receipt logic
             OTRXMPPRoomMessage.handleDeliveryReceiptRequest(message: xmppMessage, xmppStream: xmppStream)
 
+            // If this is a receipt, we are done
+            if xmppMessage.hasReceiptResponse {
+                return
+            }
+
             let stanzaId = xmppMessage.extractStanzaId(account: account, capabilities: self.capabilities)
             let originId = xmppMessage.originId