From 1482c600b460735c5ab049c94ecd4e26b37c2e8b Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Mon, 29 Oct 2018 09:57:34 -0600
Subject: [PATCH] Exception wrap PreKeyWhisperMessage for Swift

---
 .../TSInvalidIdentityKeyReceivingErrorMessage.m      |  4 ++--
 SignalServiceKit/src/Messages/OWSMessageDecrypter.m  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.m b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.m
index fac35fbdd..19987c1d1 100644
--- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.m
+++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.m
@@ -112,7 +112,7 @@ NS_ASSUME_NONNULL_BEGIN
     }
 }
 
-- (nullable NSData *)newIdentityKey
+- (nullable NSData *)try_newIdentityKey
 {
     if (!self.envelope) {
         OWSLogError(@"Error message had no envelope data to extract key from");
@@ -130,7 +130,7 @@ NS_ASSUME_NONNULL_BEGIN
         return nil;
     }
 
-    PreKeyWhisperMessage *message = [[PreKeyWhisperMessage alloc] initWithData:pkwmData];
+    PreKeyWhisperMessage *message = [[PreKeyWhisperMessage alloc] init_try_withData:pkwmData];
     return [message.identityKey removeKeyType];
 }
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m
index 972002d41..759f9f92e 100644
--- a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m
+++ b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m
@@ -229,7 +229,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
                 return;
             }
             case SSKProtoEnvelopeTypePrekeyBundle: {
-                [self decryptPreKeyBundle:envelope
+                [self try_decryptPreKeyBundle:envelope
                     envelopeData:envelopeData
                     successBlock:^(OWSMessageDecryptResult *result, YapDatabaseReadWriteTransaction *transaction) {
                         OWSLogDebug(@"decrypted pre-key whisper message");
@@ -318,10 +318,10 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
               failureBlock:failureBlock];
 }
 
-- (void)decryptPreKeyBundle:(SSKProtoEnvelope *)envelope
-               envelopeData:(NSData *)envelopeData
-               successBlock:(DecryptSuccessBlock)successBlock
-               failureBlock:(void (^)(NSError *_Nullable error))failureBlock
+- (void)try_decryptPreKeyBundle:(SSKProtoEnvelope *)envelope
+                   envelopeData:(NSData *)envelopeData
+                   successBlock:(DecryptSuccessBlock)successBlock
+                   failureBlock:(void (^)(NSError *_Nullable error))failureBlock
 {
     OWSAssertDebug(envelope);
     OWSAssertDebug(envelopeData);
@@ -335,7 +335,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
               envelopeData:envelopeData
             cipherTypeName:@"PreKey Bundle"
         cipherMessageBlock:^(NSData *encryptedData) {
-            return [[PreKeyWhisperMessage alloc] initWithData:encryptedData];
+            return [[PreKeyWhisperMessage alloc] init_try_withData:encryptedData];
         }
               successBlock:successBlock
               failureBlock:failureBlock];