Fix duplicated MAM messages

chrisballinger · chrisballinger · commit 3abf10ec5758 · 2018-07-08T14:50:42.000-07:00
diff --git a/ChatSecure/Classes/Controllers/XMPP/Storage/MessageStorage.swift b/ChatSecure/Classes/Controllers/XMPP/Storage/MessageStorage.swift
@@ -143,8 +143,8 @@ import CocoaLumberjack
         if oid == nil, sid == nil {
             return false
         }
-        transaction.enumerateMessages(elementId: nil, originId: oid, stanzaId: sid) { (message, stop) in
-            if message.threadId == buddyUniqueId {
+        transaction.enumerateMessages(elementId: oid, originId: oid, stanzaId: sid) { (foundMessage, stop) in
+            if foundMessage.threadId == buddyUniqueId {
                 result = true
                 stop.pointee = true
             }

Original file line number	Diff line number	Diff line change
`@@ -143,8 +143,8 @@ import CocoaLumberjack`
`143`	`143`	`if oid == nil, sid == nil {`
`144`	`144`	`return false`
`145`	`145`	`}`
`146`		`- transaction.enumerateMessages(elementId: nil, originId: oid, stanzaId: sid) { (message, stop) in`
`147`		`- if message.threadId == buddyUniqueId {`
	`146`	`+ transaction.enumerateMessages(elementId: oid, originId: oid, stanzaId: sid) { (foundMessage, stop) in`
	`147`	`+ if foundMessage.threadId == buddyUniqueId {`
`148`	`148`	`result = true`
`149`	`149`	`stop.pointee = true`
`150`	`150`	`}`