From 74096fc2c24696f6a1820444de3b6b17bbd67189 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Sep 2017 10:29:46 -0400 Subject: [PATCH] Don't send sync messages to self if no linked devices. // FREEBIE --- .../src/Messages/OWSMessageSender.m | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index 38d287f53..328e67c78 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -962,6 +962,25 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; } } + NSString *localNumber = [TSAccountManager localNumber]; + if ([localNumber isEqualToString:recipient.uniqueId]) { + if (deviceMessages.count < 1) { + DDLogInfo(@"Ignoring sync message without linked devices: %@", [message class]); + OWSAssert([message isKindOfClass:[OWSOutgoingSyncMessage class]]); + + dispatch_async([OWSDispatch sendingQueue], ^{ + [recipient save]; + [self handleMessageSentLocally:message]; + successHandler(); + }); + + return; + } + } else { + OWSAssert(deviceMessages.count > 0); + } + + TSSubmitMessageRequest *request = [[TSSubmitMessageRequest alloc] initWithRecipient:recipient.uniqueId messages:deviceMessages relay:recipient.relay