From a361fcc8f36462e55ca22a81bbab1be78099402e Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 9 Jul 2021 12:39:02 -0400
Subject: [PATCH] Add additional logging to media send jobs.

---
 .../securesms/jobs/PushGroupSendJob.java         |  2 +-
 .../securesms/jobs/PushMediaSendJob.java         |  2 +-
 .../org/thoughtcrime/securesms/jobs/SendJob.java | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
index b0d35245c..4382cbbff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
@@ -180,7 +180,7 @@ public final class PushGroupSendJob extends PushSendJob {
     }
 
     try {
-      log(TAG, String.valueOf(message.getSentTimeMillis()), "Sending message: " + messageId + ", Recipient: " + message.getRecipient().getId() + ", Thread: " + threadId);
+      log(TAG, String.valueOf(message.getSentTimeMillis()), "Sending message: " + messageId + ", Recipient: " + message.getRecipient().getId() + ", Thread: " + threadId + ", Attachments: " + buildAttachmentString(message.getAttachments()));
 
       if (!groupRecipient.resolve().isProfileSharing() && !database.isGroupQuitMessage(messageId)) {
         RecipientUtil.shareProfileIfFirstSecureMessage(context, groupRecipient);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
index a6b44aa98..a2581327a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
@@ -121,7 +121,7 @@ public class PushMediaSendJob extends PushSendJob {
     }
 
     try {
-      log(TAG, String.valueOf(message.getSentTimeMillis()), "Sending message: " + messageId + ", Recipient: " + message.getRecipient().getId() + ", Thread: " + threadId);
+      log(TAG, String.valueOf(message.getSentTimeMillis()), "Sending message: " + messageId + ", Recipient: " + message.getRecipient().getId() + ", Thread: " + threadId + ", Attachments: " + buildAttachmentString(message.getAttachments()));
 
       RecipientUtil.shareProfileIfFirstSecureMessage(context, message.getRecipient());
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java
index 5c1ffe3ec..8af226b41 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java
@@ -8,6 +8,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.TextSecureExpiredException;
 import org.thoughtcrime.securesms.attachments.Attachment;
+import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -20,6 +21,7 @@ import org.thoughtcrime.securesms.util.Util;
 import java.lang.reflect.Array;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public abstract class SendJob extends BaseJob {
 
@@ -62,4 +64,18 @@ public abstract class SendJob extends BaseJob {
       database.markAttachmentUploaded(messageId, attachment);
     }
   }
+
+  protected String buildAttachmentString(@NonNull List<Attachment> attachments) {
+    List<String> strings = attachments.stream().map(attachment -> {
+      if (attachment instanceof DatabaseAttachment) {
+        return ((DatabaseAttachment) attachment).getAttachmentId().toString();
+      } else if (attachment.getUri() != null) {
+        return attachment.getUri().toString();
+      } else {
+        return attachment.toString();
+      }
+    }).collect(Collectors.toList());
+
+    return Util.join(strings, ", ");
+  }
 }