Merge branch 'fix-unlinked-device-coming-back' of github.com:RyanRory/loki-messenger-ios into threading

5 years ago · ccd610253f
parent 256cd631db 07854a5e23
commit ccd610253f
1 changed files with 1 additions and 1 deletions
--- a/SignalServiceKit/src/Loki/Protocol/Multi
+++ b/SignalServiceKit/src/Loki/Protocol/Multi
@ -49,7 +49,7 @@ public final class MultiDeviceProtocol : NSObject {
    // MARK: - Sending (Part 1)
    @objc(isMultiDeviceRequiredForMessage:)
    public static func isMultiDeviceRequired(for message: TSOutgoingMessage) -> Bool {
-        return !(message is DeviceLinkMessage) && (message.thread as? TSGroupThread)?.groupModel.groupType != .openGroup
+        return !(message is DeviceLinkMessage) && !(message is UnlinkDeviceMessage) && (message.thread as? TSGroupThread)?.groupModel.groupType != .openGroup
    }

    private static func copy(_ messageSend: OWSMessageSend, for destination: MultiDeviceDestination, with seal: Resolver<Void>) -> OWSMessageSend {