From 7dc24168730fac09ce165e7105cb46b2141de9ac Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 17 May 2019 12:07:29 +1000 Subject: [PATCH] Make sure isFriendRequest is always true for OWSFriendRequestMessages --- SignalServiceKit/src/Loki/Messages/OWSFriendRequestMessage.m | 2 ++ SignalServiceKit/src/Messages/OWSMessageSender.m | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Loki/Messages/OWSFriendRequestMessage.m b/SignalServiceKit/src/Loki/Messages/OWSFriendRequestMessage.m index a44b1e121..dff9ae003 100644 --- a/SignalServiceKit/src/Loki/Messages/OWSFriendRequestMessage.m +++ b/SignalServiceKit/src/Loki/Messages/OWSFriendRequestMessage.m @@ -5,6 +5,8 @@ @implementation OWSFriendRequestMessage +-(BOOL)isFriendRequest { return YES; } + - (SSKProtoContentBuilder *)contentBuilder:(SignalRecipient *)recipient { SSKProtoContentBuilder *contentBuilder = [super contentBuilder:recipient]; diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index 0416f226e..c43c5c406 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -1111,7 +1111,6 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; NSInteger *messageType = ((NSNumber *)signalMessage[@"type"]).integerValue; if (messageType == TSFriendRequestMessageType) { [message.thread setFriendRequestStatus:TSThreadFriendRequestStatusRequestSending withTransaction:nil]; - [message setIsFriendRequest:YES withTransaction:nil]; } BOOL isPoWRequired = YES; // TODO: Base on message type [[LokiAPI objc_sendSignalMessage:signalMessage to:recipient.recipientId timestamp:message.timestamp requiringPoW:isPoWRequired]