From 5dea84e9b0cb0cb2324cd8c4d7f9bb08b4161c98 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Thu, 30 Apr 2020 13:28:48 +1000 Subject: [PATCH] Don't send auto-generated friend requests for Signal background messages --- .../src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift b/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift index 133835a54..9ac590f51 100644 --- a/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift +++ b/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift @@ -60,9 +60,8 @@ public final class MultiDeviceProtocol : NSObject { let message = messageSend.message let messageSender = SSKEnvironment.shared.messageSender promise.done(on: OWSDispatch.sendingQueue()) { thread in - let isSessionResetMessage = (message is EphemeralMessage) && thread.sessionResetStatus == .requestReceived let shouldSendAutoGeneratedFR = !thread.isContactFriend && !(message is FriendRequestMessage) - && !(message is SessionRequestMessage) && !isSessionResetMessage && !(message is TypingIndicatorMessage) + && message.shouldBeSaved() // shouldBeSaved indicates it isn't a transient message if !shouldSendAutoGeneratedFR { let messageSendCopy = copy(messageSend, for: destination, with: seal) messageSender.sendMessage(messageSendCopy)