From 24a19eaaca9593c82c24b83b6869765605abf953 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 28 Nov 2018 21:49:49 -0700 Subject: [PATCH 1/2] update REST endpoint ack url --- Signal/src/Jobs/MessageFetcherJob.swift | 4 ++-- SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h | 3 +-- SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Signal/src/Jobs/MessageFetcherJob.swift b/Signal/src/Jobs/MessageFetcherJob.swift index a6ab01294..6fd5c4e92 100644 --- a/Signal/src/Jobs/MessageFetcherJob.swift +++ b/Signal/src/Jobs/MessageFetcherJob.swift @@ -198,8 +198,8 @@ private private func acknowledgeDelivery(envelope: SSKProtoEnvelope) { let request: TSRequest - if let serverGuid = envelope.serverGuid, envelope.hasServerTimestamp, serverGuid.count > 0, envelope.serverTimestamp > 0 { - request = OWSRequestFactory.acknowledgeMessageDeliveryRequest(withServerGuid: serverGuid, serverTimestamp: envelope.serverTimestamp) + if let serverGuid = envelope.serverGuid, serverGuid.count > 0 { + 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 { diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h index 9a0d13abe..490403435 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h @@ -23,8 +23,7 @@ typedef NS_ENUM(NSUInteger, TSVerificationTransport) { TSVerificationTransportVo + (TSRequest *)acknowledgeMessageDeliveryRequestWithSource:(NSString *)source timestamp:(UInt64)timestamp; -+ (TSRequest *)acknowledgeMessageDeliveryRequestWithServerGuid:(NSString *)serverGuid - serverTimestamp:(UInt64)serverTimestamp; ++ (TSRequest *)acknowledgeMessageDeliveryRequestWithServerGuid:(NSString *)serverGuid; + (TSRequest *)deleteDeviceRequestWithDevice:(OWSDevice *)device; diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m index 2ef8041dc..bad2dae92 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m @@ -73,12 +73,10 @@ NS_ASSUME_NONNULL_BEGIN } + (TSRequest *)acknowledgeMessageDeliveryRequestWithServerGuid:(NSString *)serverGuid - serverTimestamp:(UInt64)serverTimestamp { OWSAssertDebug(serverGuid.length > 0); - OWSAssertDebug(serverTimestamp > 0); - NSString *path = [NSString stringWithFormat:@"v1/messages/%@/%llu", serverGuid, serverTimestamp]; + NSString *path = [NSString stringWithFormat:@"v1/messages/uuid/%@", serverGuid]; return [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"DELETE" parameters:@{}]; } From 9713c5870c47b1fb3c27a6adb6c00be44be5940a Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 28 Nov 2018 21:51:19 -0700 Subject: [PATCH 2/2] "Bump build to 2.31.1.0." --- Signal/Signal-Info.plist | 4 ++-- SignalShareExtension/Info.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 5593fd41a..d6be6f842 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -32,7 +32,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.31.0 + 2.31.1 CFBundleSignature ???? CFBundleURLTypes @@ -49,7 +49,7 @@ CFBundleVersion - 2.31.0.39 + 2.31.1.0 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 79859221b..3bd19ef94 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.31.0 + 2.31.1 CFBundleVersion - 2.31.0.39 + 2.31.1.0 ITSAppUsesNonExemptEncryption NSAppTransportSecurity