pull/11/head
Niels Andriesse 6 years ago
parent bae617c3ba
commit 574c72523b

@ -223,8 +223,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
successBlock(result, transaction); successBlock(result, transaction);
} }
failureBlock:^(NSError * _Nullable error) { failureBlock:^(NSError * _Nullable error) {
OWSLogError(@"decrypting friend request message from address: %@ failed " OWSLogError(@"decrypting friend request message from address: %@ failed with error: %@",
@"with error: %@",
envelopeAddress(envelope), envelopeAddress(envelope),
error); error);
failureBlock(); failureBlock();
@ -338,11 +337,10 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
} }
NSString *recipientId = envelope.source; NSString *recipientId = envelope.source;
FallBackSessionCipher *ciper = [[FallBackSessionCipher alloc] initWithRecipientId:recipientId FallBackSessionCipher *cipher = [[FallBackSessionCipher alloc] initWithRecipientId:recipientId identityKeyStore:self.identityManager];
identityKeyStore:self.identityManager];
// Decrypt it!! // Decrypt it!!
NSData *_Nullable plaintextData = [ciper decryptWithMessage:encryptedData]; NSData *_Nullable plaintextData = [cipher decryptWithMessage:encryptedData];
if (!plaintextData) { if (!plaintextData) {
NSString *errorString = [NSString stringWithFormat:@"Failed to decrypt friend request message for %@", recipientId]; NSString *errorString = [NSString stringWithFormat:@"Failed to decrypt friend request message for %@", recipientId];
NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecryptMessage, errorString); NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecryptMessage, errorString);

Loading…
Cancel
Save