Merge branch 'charlesmchen/decryptionExceptionLogging'

src/Messages/TSMessagesManager.m

@@ -710,7 +710,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)processException:(NSException *)exception envelope:(OWSSignalServiceProtosEnvelope *)envelope
 {
     OWSAssert([NSThread isMainThread]);
-    DDLogError(@"%@ Got exception: %@ of type: %@", self.tag, exception.description, exception.name);
+    DDLogError(@"%@ Got exception: %@ of type: %@ with reason: %@",
+        self.tag,
+        exception.description,
+        exception.name,
+        exception.reason);
     [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
       TSErrorMessage *errorMessage;
 

src/Storage/AxolotlStore/TSStorageManager+PreKeyStore.m

@@ -55,8 +55,9 @@
         [self preKeyRecordForKey:[self keyFromInt:preKeyId] inCollection:TSStorageManagerPreKeyStoreCollection];
 
     if (!preKeyRecord) {
-        @throw
+        @throw [NSException exceptionWithName:InvalidKeyIdException
-            [NSException exceptionWithName:InvalidKeyIdException reason:@"No key found matching key id" userInfo:@{}];
+                                       reason:@"No pre key found matching key id"
+                                     userInfo:@{}];
     } else {
         return preKeyRecord;
     }

src/Storage/AxolotlStore/TSStorageManager+SignedPreKeyStore.m

@@ -38,8 +38,9 @@ NSString *const TSStorageManagerKeyPrekeyCurrentSignedPrekeyId = @"currentSigned
                                                          inCollection:TSStorageManagerSignedPreKeyStoreCollection];
 
     if (!preKeyRecord) {
-        @throw
+        @throw [NSException exceptionWithName:InvalidKeyIdException
-            [NSException exceptionWithName:InvalidKeyIdException reason:@"No key found matching key id" userInfo:@{}];
+                                       reason:@"No signed pre key found matching key id"
+                                     userInfo:@{}];
     } else {
         return preKeyRecord;
     }