From 8d823193f11f8b3d87da64b28830e0ffc401b78f Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Mon, 29 Oct 2018 10:29:44 -0600
Subject: [PATCH] Exception wrap WhisperMessage for Swift

---
 SignalServiceKit/src/Messages/OWSMessageDecrypter.m | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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