From 210da508684a6436d0f030c7220dcffb4befb72d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 14 Nov 2018 17:26:39 -0500 Subject: [PATCH] Rework ACK of messages fetched via REST. --- Signal/src/Jobs/MessageFetcherJob.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/src/Jobs/MessageFetcherJob.swift b/Signal/src/Jobs/MessageFetcherJob.swift index 81823c8ec..a6ab01294 100644 --- a/Signal/src/Jobs/MessageFetcherJob.swift +++ b/Signal/src/Jobs/MessageFetcherJob.swift @@ -198,9 +198,9 @@ private private func acknowledgeDelivery(envelope: SSKProtoEnvelope) { let request: TSRequest - if let serverGuid = envelope.serverGuid, envelope.hasServerTimestamp { + if let serverGuid = envelope.serverGuid, envelope.hasServerTimestamp, serverGuid.count > 0, envelope.serverTimestamp > 0 { request = OWSRequestFactory.acknowledgeMessageDeliveryRequest(withServerGuid: serverGuid, serverTimestamp: envelope.serverTimestamp) - } else if let source = envelope.source { + } else if let source = envelope.source, source.count > 0, envelope.timestamp > 0 { request = OWSRequestFactory.acknowledgeMessageDeliveryRequest(withSource: source, timestamp: envelope.timestamp) } else { owsFailDebug("Cannot ACK message which has neither source, nor server GUID and timestamp.")