From f084c804c5b43627fd8cbc3ec753c72a4facfeb5 Mon Sep 17 00:00:00 2001 From: Mikunj Date: Thu, 23 May 2019 15:50:37 +1000 Subject: [PATCH] Fix ttl not being in milliseconds. --- SignalServiceKit/src/Loki/API/LokiAPI+Message.swift | 2 +- SignalServiceKit/src/Loki/Messages/LKFriendRequestMessage.m | 2 +- SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SignalServiceKit/src/Loki/API/LokiAPI+Message.swift b/SignalServiceKit/src/Loki/API/LokiAPI+Message.swift index 021348535..2d280d2d2 100644 --- a/SignalServiceKit/src/Loki/API/LokiAPI+Message.swift +++ b/SignalServiceKit/src/Loki/API/LokiAPI+Message.swift @@ -7,7 +7,7 @@ public extension LokiAPI { let destination: String /// The content of the message. let data: LosslessStringConvertible - /// The time to live for the message in seconds. + /// The time to live for the message in milliseconds. let ttl: UInt64 /// When the proof of work was calculated, if applicable. /// diff --git a/SignalServiceKit/src/Loki/Messages/LKFriendRequestMessage.m b/SignalServiceKit/src/Loki/Messages/LKFriendRequestMessage.m index cddf75886..9897e988e 100644 --- a/SignalServiceKit/src/Loki/Messages/LKFriendRequestMessage.m +++ b/SignalServiceKit/src/Loki/Messages/LKFriendRequestMessage.m @@ -8,7 +8,7 @@ - (BOOL)isFriendRequest { return YES; } -- (uint)ttl { return 4 * kDayInterval; } // Friend requests should stay for the longest on the storage server +- (uint)ttl { return 4 * kDayInMs; } // Friend requests should stay for the longest on the storage server - (SSKProtoContentBuilder *)contentBuilder:(SignalRecipient *)recipient { SSKProtoContentBuilder *contentBuilder = [super contentBuilder:recipient]; diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m index 67ff9d8b4..28804965d 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m @@ -1155,7 +1155,7 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt - (uint)ttl { // Time to live for all messages (except friend request messages) should be 1 day // TODO: Change this to return a value that the user chose - return 1 * kDayInterval; + return 1 * kDayInMs; } @end