keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

enable device link message with sealed sender

Browse Source
pull/82/head
Ryan ZHAO 6 years ago
parent fe158de362
commit 774478a6e2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

14
SignalServiceKit/src/Messages/OWSMessageSender.m
Unescape Escape View File

@ -1949,13 +1949,13 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
// Loki: Both for friend request messages and device link messages we use fallback encryption as we don't necessarily have a session yet // Loki: Both for friend request messages and device link messages we use fallback encryption as we don't necessarily have a session yet
BOOL isFriendRequest = [messageSend.message isKindOfClass:LKFriendRequestMessage.class]; BOOL isFriendRequest = [messageSend.message isKindOfClass:LKFriendRequestMessage.class];
BOOL isDeviceLinkMessage = [messageSend.message isKindOfClass:LKDeviceLinkMessage.class]; BOOL isDeviceLinkMessage = [messageSend.message isKindOfClass:LKDeviceLinkMessage.class] && ((LKDeviceLinkMessage *)messageSend.message).kind == LKDeviceLinkMessageKindRequest;
if ((isDeviceLinkMessage && ((LKDeviceLinkMessage *)messageSend.message).kind == LKDeviceLinkMessageKindRequest)) { // if ((isDeviceLinkMessage && ((LKDeviceLinkMessage *)messageSend.message).kind == LKDeviceLinkMessageKindRequest)) {
return [self throws_encryptedFriendRequestOrDeviceLinkMessageForMessageSend:messageSend deviceId:@(OWSDevicePrimaryDeviceId) plainText:plainText]; // return [self throws_encryptedFriendRequestOrDeviceLinkMessageForMessageSend:messageSend deviceId:@(OWSDevicePrimaryDeviceId) plainText:plainText];
} // }
// This may throw an exception. // This may throw an exception.
if (!isFriendRequest && ![storage containsSession:recipientID deviceId:@(OWSDevicePrimaryDeviceId).intValue protocolContext:transaction]) { if (!isFriendRequest && !isDeviceLinkMessage && ![storage containsSession:recipientID deviceId:@(OWSDevicePrimaryDeviceId).intValue protocolContext:transaction]) {
NSString *missingSessionException = @"missingSessionException"; NSString *missingSessionException = @"missingSessionException";
OWSRaiseException(missingSessionException, OWSRaiseException(missingSessionException,
@"Unexpectedly missing session for recipient: %@, device: %@", @"Unexpectedly missing session for recipient: %@, device: %@",
@ -1989,7 +1989,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
paddedPlaintext:[plainText paddedMessageBody] paddedPlaintext:[plainText paddedMessageBody]
senderCertificate:messageSend.senderCertificate senderCertificate:messageSend.senderCertificate
protocolContext:transaction protocolContext:transaction
isFriendRequest:isFriendRequest isFriendRequest:isFriendRequest || isDeviceLinkMessage
error:&error]; error:&error];
SCKRaiseIfExceptionWrapperError(error); SCKRaiseIfExceptionWrapperError(error);
if (!serializedMessage || error) { if (!serializedMessage || error) {
@ -2020,7 +2020,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
registrationId:[cipher throws_remoteRegistrationId:transaction] registrationId:[cipher throws_remoteRegistrationId:transaction]
ttl:message.ttl ttl:message.ttl
isPing:isPing isPing:isPing
isFriendRequest:isFriendRequest]; isFriendRequest:isFriendRequest || isDeviceLinkMessage];
NSError *error; NSError *error;
NSDictionary *jsonDict = [MTLJSONAdapter JSONDictionaryFromModel:messageParams error:&error]; NSDictionary *jsonDict = [MTLJSONAdapter JSONDictionaryFromModel:messageParams error:&error];

Write Preview
Loading…
Cancel
Save