From 24f31081d1241ef46b58eeb91472b32bea5e6256 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Thu, 6 Feb 2020 16:58:32 +1100 Subject: [PATCH] support sealed sender (envelopes with no source) for push notification --- Signal/src/Jobs/MessageFetcherJob.swift | 2 ++ SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Signal/src/Jobs/MessageFetcherJob.swift b/Signal/src/Jobs/MessageFetcherJob.swift index 3fac71a50..4e83a2d24 100644 --- a/Signal/src/Jobs/MessageFetcherJob.swift +++ b/Signal/src/Jobs/MessageFetcherJob.swift @@ -230,6 +230,8 @@ public class MessageFetcherJob: NSObject { request = OWSRequestFactory.acknowledgeMessageDeliveryRequest(withServerGuid: serverGuid) } else if let source = envelope.source, source.count > 0, envelope.timestamp > 0 { request = OWSRequestFactory.acknowledgeMessageDeliveryRequest(withSource: source, timestamp: envelope.timestamp) + } else if envelope.type == .unidentifiedSender, envelope.timestamp > 0 { + request = OWSRequestFactory.acknowledgeMessageDeliveryRequest(withSource: envelope.source!, timestamp: envelope.timestamp) } else { owsFailDebug("Cannot ACK message which has neither source, nor server GUID and timestamp.") return diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m index 7dc6d5c69..a3d6bd213 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m @@ -64,7 +64,7 @@ NS_ASSUME_NONNULL_BEGIN + (TSRequest *)acknowledgeMessageDeliveryRequestWithSource:(NSString *)source timestamp:(UInt64)timestamp { - OWSAssertDebug(source.length > 0); +// OWSAssertDebug(source.length > 0); OWSAssertDebug(timestamp > 0); NSString *path = [NSString stringWithFormat:@"v1/messages/%@/%llu", source, timestamp];