From 4b6cb79c75018df8b23886d226f458714dfc7025 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 18 Jun 2021 13:52:31 -0400 Subject: [PATCH] Fix message exception handling. --- .../securesms/messages/MessageDecryptionUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptionUtil.java b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptionUtil.java index fc10194cc6..35b4ef741c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptionUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptionUtil.java @@ -82,7 +82,7 @@ public final class MessageDecryptionUtil { Log.w(TAG, String.valueOf(envelope.getTimestamp()), e); return DecryptionResult.forError(MessageState.INVALID_VERSION, toExceptionMetadata(e), jobs); - } catch (ProtocolInvalidKeyIdException | ProtocolInvalidKeyException | ProtocolUntrustedIdentityException | ProtocolNoSessionException e) { + } catch (ProtocolInvalidKeyIdException | ProtocolInvalidKeyException | ProtocolUntrustedIdentityException | ProtocolNoSessionException | ProtocolInvalidMessageException e) { Log.w(TAG, String.valueOf(envelope.getTimestamp()), e); Recipient sender = Recipient.external(context, e.getSender()); @@ -99,7 +99,7 @@ public final class MessageDecryptionUtil { } catch (ProtocolDuplicateMessageException e) { Log.w(TAG, String.valueOf(envelope.getTimestamp()), e); return DecryptionResult.forError(MessageState.DUPLICATE_MESSAGE, toExceptionMetadata(e), jobs); - } catch (InvalidMetadataVersionException | InvalidMetadataMessageException | ProtocolInvalidMessageException e) { + } catch (InvalidMetadataVersionException | InvalidMetadataMessageException e) { Log.w(TAG, String.valueOf(envelope.getTimestamp()), e); return DecryptionResult.forNoop(jobs); } catch (SelfSendException e) {