From 97dd756136683ab666df0c18370682969e45e35b Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 14 Oct 2021 13:17:35 -0400
Subject: [PATCH] Improve logging for decryption failures.

---
 .../securesms/messages/MessageDecryptionUtil.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 6fc942e08a..124be017b1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptionUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptionUtil.java
@@ -106,19 +106,19 @@ public final class MessageDecryptionUtil {
 
         return DecryptionResult.forNoop(jobs);
       } catch (ProtocolLegacyMessageException e) {
-        Log.w(TAG, String.valueOf(envelope.getTimestamp()), e);
+        Log.w(TAG, "[" + envelope.getTimestamp() + "] " + envelope.getSourceIdentifier() + ":" + envelope.getSourceDevice(), e);
         return DecryptionResult.forError(MessageState.LEGACY_MESSAGE, toExceptionMetadata(e), jobs);
       } catch (ProtocolDuplicateMessageException e) {
-        Log.w(TAG, String.valueOf(envelope.getTimestamp()), e);
+        Log.w(TAG, "[" + envelope.getTimestamp() + "] " + envelope.getSourceIdentifier() + ":" + envelope.getSourceDevice(), e);
         return DecryptionResult.forError(MessageState.DUPLICATE_MESSAGE, toExceptionMetadata(e), jobs);
       } catch (InvalidMetadataVersionException | InvalidMetadataMessageException | InvalidMessageStructureException e) {
-        Log.w(TAG, String.valueOf(envelope.getTimestamp()), e);
+        Log.w(TAG, "[" + envelope.getTimestamp() + "] " + envelope.getSourceIdentifier() + ":" + envelope.getSourceDevice(), e);
         return DecryptionResult.forNoop(jobs);
       } catch (SelfSendException e) {
         Log.i(TAG, "Dropping UD message from self.");
         return DecryptionResult.forNoop(jobs);
       } catch (UnsupportedDataMessageException e) {
-        Log.w(TAG, String.valueOf(envelope.getTimestamp()), e);
+        Log.w(TAG, "[" + envelope.getTimestamp() + "] " + envelope.getSourceIdentifier() + ":" + envelope.getSourceDevice(), e);
         return DecryptionResult.forError(MessageState.UNSUPPORTED_DATA_MESSAGE, toExceptionMetadata(e), jobs);
       }
     } catch (NoSenderException e) {