Respond to CR.

Signal/src/util/OWSBackupImportJob.m

@@ -391,19 +391,12 @@ NSString *const kOWSBackup_ImportDatabaseKeySpec = @"kOWSBackup_ImportDatabaseKe
                     aborted = YES;
                     return completion(NO);
                 }
-                SignalIOSProtoBackupSnapshot *_Nullable entities;
+                NSError *error;
-                @try {
+                SignalIOSProtoBackupSnapshot *_Nullable entities =
-                    NSError *error;
+                    [SignalIOSProtoBackupSnapshot parseData:uncompressedData error:&error];
-                    entities = [SignalIOSProtoBackupSnapshot parseData:uncompressedData error:&error];
+                if (!entities || error) {
-                    if (!entities || error) {
+                    DDLogError(@"%@ could not parse proto: %@.", self.logTag, error);
-                        DDLogError(@"%@ could not parse proto: %@.", self.logTag, error);
+                    // Database-related errors are unrecoverable.
-                        // Database-related errors are unrecoverable.
-                        aborted = YES;
-                        return completion(NO);
-                    }
-                } @catch (NSException *exception) {
-                    OWSProdLogAndFail(@"%@ Could not parse proto: %@", self.logTag, exception.debugDescription);
-                    // TODO: Add analytics.
                     aborted = YES;
                     return completion(NO);
                 }

SignalServiceKit/src/Messages/OWSMessageReceiver.m

@@ -328,11 +328,9 @@ NSString *const OWSMessageDecryptJobFinderExtensionGroup = @"OWSMessageProcessin
     AssertOnDispatchQueue(self.serialQueue);
     OWSAssert(job);
 
-    SSKProtoEnvelope *_Nullable envelope = nil;
+    SSKProtoEnvelope *_Nullable envelope = job.envelopeProto;
-    @try {
+    if (!envelope) {
-        envelope = job.envelopeProto;
+        OWSProdLogAndFail(@"%@ Could not parse proto.", self.logTag);
-    } @catch (NSException *exception) {
-        OWSProdLogAndFail(@"%@ Could not parse proto: %@", self.logTag, exception.debugDescription);
         // TODO: Add analytics.
 
         [[OWSPrimaryStorage.sharedManager newDatabaseConnection]

SignalServiceKit/src/Network/WebSockets/TSSocketManager.m

@@ -698,17 +698,10 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_
     // If we receive a response, we know we're not de-registered.
     [TSAccountManager.sharedInstance setIsDeregistered:NO];
 
-    WebSocketProtoWebSocketMessage *_Nullable wsMessage;
+    NSError *error;
-    @try {
+    WebSocketProtoWebSocketMessage *_Nullable wsMessage = [WebSocketProtoWebSocketMessage parseData:data error:&error];
-        NSError *error;
+    if (!wsMessage || error) {
-        wsMessage = [WebSocketProtoWebSocketMessage parseData:data error:&error];
+        OWSFail(@"%@ could not parse proto: %@", self.logTag, error);
-        if (!wsMessage || error) {
-            OWSFail(@"%@ could not parse proto: %@", self.logTag, error);
-            return;
-        }
-    } @catch (NSException *exception) {
-        OWSProdLogAndFail(@"%@ Received an invalid message: %@", self.logTag, exception.debugDescription);
-        // TODO: Add analytics.
         return;
     }
 

SignalServiceKit/src/Security/OWSFingerprint.m

@@ -93,21 +93,15 @@ static uint32_t const OWSFingerprintDefaultHashIterations = 5200;
     OWSAssert(data.length > 0);
     OWSAssert(error);
 
-    FingerprintProtoLogicalFingerprints *logicalFingerprints;
+    *error = nil;
-    @try {
+    FingerprintProtoLogicalFingerprints *_Nullable logicalFingerprints;
-        *error = nil;
+    logicalFingerprints = [FingerprintProtoLogicalFingerprints parseData:data error:error];
-        logicalFingerprints = [FingerprintProtoLogicalFingerprints parseData:data error:error];
+    if (!logicalFingerprints || *error) {
-        if (!logicalFingerprints || *error) {
+        OWSFail(@"%@ fingerprint failure: %@", self.logTag, *error);
-            OWSFail(@"%@ fingerprint failure: %@", self.logTag, *error);
+
-
+        NSString *description = NSLocalizedString(@"PRIVACY_VERIFICATION_FAILURE_INVALID_QRCODE", @"alert body");
-            NSString *description = NSLocalizedString(@"PRIVACY_VERIFICATION_FAILURE_INVALID_QRCODE", @"alert body");
+        *error = OWSErrorWithCodeDescription(OWSErrorCodePrivacyVerificationFailure, description);
-            *error = OWSErrorWithCodeDescription(OWSErrorCodePrivacyVerificationFailure, description);
+        return NO;
-            return NO;
-        }
-    } @catch (NSException *exception) {
-        // Sync log in case we bail.
-        DDLogError(@"%@ parsing QRCode data failed with error: %@", self.logTag, exception);
-        @throw exception;
     }
 
     if (logicalFingerprints.version < OWSFingerprintScannableFormatVersion) {