Exception wrap WhisperMessage for Swift

pull/1/head
Michael Kirk 7 years ago
parent 1482c600b4
commit 8d823193f1

@ -212,7 +212,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
switch (envelope.type) { switch (envelope.type) {
case SSKProtoEnvelopeTypeCiphertext: { case SSKProtoEnvelopeTypeCiphertext: {
[self decryptSecureMessage:envelope [self try_decryptSecureMessage:envelope
envelopeData:envelopeData envelopeData:envelopeData
successBlock:^(OWSMessageDecryptResult *result, YapDatabaseReadWriteTransaction *transaction) { successBlock:^(OWSMessageDecryptResult *result, YapDatabaseReadWriteTransaction *transaction) {
OWSLogDebug(@"decrypted secure message."); OWSLogDebug(@"decrypted secure message.");
@ -298,10 +298,10 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
failureBlock(); failureBlock();
} }
- (void)decryptSecureMessage:(SSKProtoEnvelope *)envelope - (void)try_decryptSecureMessage:(SSKProtoEnvelope *)envelope
envelopeData:(NSData *)envelopeData envelopeData:(NSData *)envelopeData
successBlock:(DecryptSuccessBlock)successBlock successBlock:(DecryptSuccessBlock)successBlock
failureBlock:(void (^)(NSError *_Nullable error))failureBlock failureBlock:(void (^)(NSError *_Nullable error))failureBlock
{ {
OWSAssertDebug(envelope); OWSAssertDebug(envelope);
OWSAssertDebug(envelopeData); OWSAssertDebug(envelopeData);
@ -312,7 +312,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
envelopeData:envelopeData envelopeData:envelopeData
cipherTypeName:@"Secure Message" cipherTypeName:@"Secure Message"
cipherMessageBlock:^(NSData *encryptedData) { cipherMessageBlock:^(NSData *encryptedData) {
return [[WhisperMessage alloc] initWithData:encryptedData]; return [[WhisperMessage alloc] init_try_withData:encryptedData];
} }
successBlock:successBlock successBlock:successBlock
failureBlock:failureBlock]; failureBlock:failureBlock];

Loading…
Cancel
Save