From b5677210d2e8253442ea3b5564d515b4054493ff Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 31 May 2019 10:46:57 +1000 Subject: [PATCH] Remove unused parameter --- SignalServiceKit/src/Loki/API/LokiAPI.swift | 8 ++++---- SignalServiceKit/src/Messages/OWSMessageSender.m | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SignalServiceKit/src/Loki/API/LokiAPI.swift b/SignalServiceKit/src/Loki/API/LokiAPI.swift index c264b4e53..130e19453 100644 --- a/SignalServiceKit/src/Loki/API/LokiAPI.swift +++ b/SignalServiceKit/src/Loki/API/LokiAPI.swift @@ -53,7 +53,7 @@ import PromiseKit }.map { Set($0) }.retryingIfNeeded(maxRetryCount: maxRetryCount) } - public static func sendSignalMessage(_ signalMessage: SignalMessage, to destination: String, with timestamp: UInt64, onP2PSuccess: @escaping () -> Void) -> Promise> { + public static func sendSignalMessage(_ signalMessage: SignalMessage, with timestamp: UInt64, onP2PSuccess: @escaping () -> Void) -> Promise> { guard let lokiMessage = Message.from(signalMessage: signalMessage, with: timestamp) else { return Promise(error: Error.messageConversionFailed) } let destination = lokiMessage.destination func sendLokiMessage(_ lokiMessage: Message, to target: Target) -> RawResponsePromise { @@ -91,9 +91,9 @@ import PromiseKit } // MARK: Public API (Obj-C) - @objc(sendSignalMessage:to:with:onP2PSuccess:) - public static func objc_sendSignalMessage(_ signalMessage: SignalMessage, to destination: String, with timestamp: UInt64, onP2PSuccess: @escaping () -> Void) -> AnyPromise { - let promise = sendSignalMessage(signalMessage, to: destination, with: timestamp, onP2PSuccess: onP2PSuccess).mapValues { AnyPromise.from($0) }.map { Set($0) } + @objc(sendSignalMessage:with:onP2PSuccess:) + public static func objc_sendSignalMessage(_ signalMessage: SignalMessage, with timestamp: UInt64, onP2PSuccess: @escaping () -> Void) -> AnyPromise { + let promise = sendSignalMessage(signalMessage, with: timestamp, onP2PSuccess: onP2PSuccess).mapValues { AnyPromise.from($0) }.map { Set($0) } return AnyPromise.from(promise) } diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index 1863aac18..2d5dce7df 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -1145,7 +1145,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; [self messageSendDidFail:messageSend deviceMessages:deviceMessages statusCode:statusCode error:error responseData:responseData]; }; // Convert the message to a Loki message and send it using the Loki API - [[LokiAPI sendSignalMessage:signalMessage to:recipient.recipientId with:message.timestamp onP2PSuccess:onP2PSuccess] + [[LokiAPI sendSignalMessage:signalMessage with:message.timestamp onP2PSuccess:onP2PSuccess] .thenOn(OWSDispatch.sendingQueue, ^(id result) { NSSet *promises = (NSSet *)result; __block BOOL isSuccess = NO;