From b281b817ba644e78a8412d4ed7040b5923cbb78d Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Tue, 22 Oct 2019 10:52:55 -0400 Subject: [PATCH] Add additional logging around attachment upload/deletion. --- .../securesms/database/AttachmentDatabase.java | 10 ++++++++-- .../securesms/jobs/AttachmentUploadJob.java | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java index 794a141482..12d9cddde1 100644 --- a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java +++ b/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java @@ -293,6 +293,8 @@ public class AttachmentDatabase extends Database { @SuppressWarnings("ResultOfMethodCallIgnored") public void deleteAttachmentsForMessage(long mmsId) { + Log.d(TAG, "[deleteAttachmentsForMessage] mmsId: " + mmsId); + SQLiteDatabase database = databaseHelper.getWritableDatabase(); Cursor cursor = null; @@ -317,6 +319,8 @@ public class AttachmentDatabase extends Database { } public void deleteAttachmentFilesForMessage(long mmsId) { + Log.d(TAG, "[deleteAttachmentFilesForMessage] mmsId: " + mmsId); + SQLiteDatabase database = databaseHelper.getWritableDatabase(); Cursor cursor = null; @@ -360,6 +364,8 @@ public class AttachmentDatabase extends Database { public void deleteAttachment(@NonNull AttachmentId id) { + Log.d(TAG, "[deleteAttachment] attachmentId: " + id); + SQLiteDatabase database = databaseHelper.getWritableDatabase(); try (Cursor cursor = database.query(TABLE_NAME, @@ -408,9 +414,9 @@ public class AttachmentDatabase extends Database { boolean dataInUse = isDataUsedByAnotherAttachment(data, attachmentId); if (dataInUse) { - Log.i(TAG, "[deleteAttachmentOnDisk] Attachment in use. Skipping deletion. " + data); + Log.i(TAG, "[deleteAttachmentOnDisk] Attachment in use. Skipping deletion. " + data + " " + attachmentId); } else { - Log.i(TAG, "[deleteAttachmentOnDisk] No other users of this attachment. Safe to delete. " + data); + Log.i(TAG, "[deleteAttachmentOnDisk] No other users of this attachment. Safe to delete. " + data + " " + attachmentId); } if (!TextUtils.isEmpty(data) && !dataInUse) { diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java b/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java index fb75e768a7..2fa9143254 100644 --- a/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java @@ -95,6 +95,8 @@ public final class AttachmentUploadJob extends BaseJob { throw new InvalidAttachmentException("Cannot find the specified attachment."); } + Log.i(TAG, "Uploading attachment for message " + databaseAttachment.getMmsId() + " with ID " + databaseAttachment.getAttachmentId()); + try (NotificationController notification = getNotificationForAttachment(databaseAttachment)) { SignalServiceAttachment localAttachment = getAttachmentFor(databaseAttachment, notification); SignalServiceAttachmentPointer remoteAttachment = messageSender.uploadAttachment(localAttachment.asStream());