Merge pull request #126 from RyanRory/fix-unlink-device

fix unlink device
pull/133/head
gmbnt 5 years ago committed by GitHub
commit 3c3eb0d189
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -48,6 +48,7 @@
#import "LKSessionRequestMessage.h" #import "LKSessionRequestMessage.h"
#import "LKSessionRestoreMessage.h" #import "LKSessionRestoreMessage.h"
#import "LKDeviceLinkMessage.h" #import "LKDeviceLinkMessage.h"
#import "LKUnlinkDeviceMessage.h"
#import "LKAddressMessage.h" #import "LKAddressMessage.h"
#import <AxolotlKit/AxolotlExceptions.h> #import <AxolotlKit/AxolotlExceptions.h>
#import <AxolotlKit/CipherMessage.h> #import <AxolotlKit/CipherMessage.h>
@ -987,7 +988,8 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
BOOL isGroupMessage = messageSend.thread.isGroupThread; BOOL isGroupMessage = messageSend.thread.isGroupThread;
BOOL isPublicChatMessage = isGroupMessage && ((TSGroupThread *)messageSend.thread).isPublicChat; BOOL isPublicChatMessage = isGroupMessage && ((TSGroupThread *)messageSend.thread).isPublicChat;
BOOL isDeviceLinkMessage = [message isKindOfClass:LKDeviceLinkMessage.class]; BOOL isDeviceLinkMessage = [message isKindOfClass:LKDeviceLinkMessage.class];
if (isPublicChatMessage || isDeviceLinkMessage) { BOOL isUnlinkDeviceMessage = [message isKindOfClass:LKUnlinkDeviceMessage.class];
if (isPublicChatMessage || isDeviceLinkMessage || isUnlinkDeviceMessage) {
[self sendMessage:messageSend]; [self sendMessage:messageSend];
} else { } else {
BOOL isSilentMessage = message.isSilent || [message isKindOfClass:LKEphemeralMessage.class] || [message isKindOfClass:OWSOutgoingSyncMessage.class]; BOOL isSilentMessage = message.isSilent || [message isKindOfClass:LKEphemeralMessage.class] || [message isKindOfClass:OWSOutgoingSyncMessage.class];

Loading…
Cancel
Save