Merge branch 'charlesmchen/lostMessages'

pull/1/head
Matthew Chen 9 years ago
commit dca3fa5001

@ -138,7 +138,7 @@ CHECKOUT OPTIONS:
:commit: 7054e4b13ee5bcd6d524adb6dc9a726e8c466308
:git: https://github.com/WhisperSystems/JSQMessagesViewController.git
SignalServiceKit:
:commit: 2367ab743968c2135e02655d8417d2c3017f30f6
:commit: 91aeddf383ec50e70425103e80c1eb734b25fa53
:git: https://github.com/WhisperSystems/SignalServiceKit.git
SocketRocket:
:commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf

@ -39,9 +39,10 @@ class MessageFetcherJob: NSObject {
let runPromise = self.fetchUndeliveredMessages().then { (envelopes: [OWSSignalServiceProtosEnvelope], more: Bool) -> Void in
for envelope in envelopes {
Logger.info("\(self.TAG) received envelope.")
self.messagesManager.handleReceivedEnvelope(envelope)
self.acknowledgeDelivery(envelope: envelope)
self.messagesManager.handleReceivedEnvelope(envelope, completion: {
// Don't acknowledge delivery until the envelope has been processed.
self.acknowledgeDelivery(envelope: envelope)
})
}
if more {
Logger.info("\(self.TAG) more messages, so recursing.")

Loading…
Cancel
Save