From 0030366ade489189967bbc5eda56270093f76906 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 2 Sep 2026 12:38:33 +0000 Subject: [PATCH] Don't mark attachments archived when a copy to the archive CDN fails. --- .../org/thoughtcrime/securesms/database/AttachmentTable.kt | 4 ++-- .../securesms/jobs/CopyAttachmentToArchiveJob.kt | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt index f3f5175fb5..e02cfa5ea1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt @@ -4564,7 +4564,7 @@ class AttachmentTable( appendLine("Media names with thumbnails count: $mediaNamesWithThumbnailsCount") appendLine("Pending attachment upload bytes: $pendingAttachmentUploadBytes") appendLine("Last snapshot full-size count: $lastSnapshotFullSizeCount") - appendLine("Last snapshot thumbnail count : $lastSnapshotFullSizeCount") + appendLine("Last snapshot thumbnail count : $lastSnapshotThumbnailCount") appendLine("Uploaded attachment bytes: $uploadedAttachmentBytes") appendLine("Uploaded thumbnail bytes: $uploadedThumbnailBytes") appendLine("Total upload count: $totalUploadCount") @@ -4592,7 +4592,7 @@ class AttachmentTable( appendLine("Total unique data files: $totalUniqueDataFiles") appendLine("Total unique media names: $totalUniqueMediaNames") appendLine("Last snapshot full-size count: $lastSnapshotFullSizeCount") - appendLine("Last snapshot thumbnail count : $lastSnapshotFullSizeCount") + appendLine("Last snapshot thumbnail count : $lastSnapshotThumbnailCount") appendLine("Pending attachment upload bytes: $pendingAttachmentUploadBytes") if (archiveStatusMediaNameCounts.isNotEmpty()) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CopyAttachmentToArchiveJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CopyAttachmentToArchiveJob.kt index 55f488ba70..b6a7c031a8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CopyAttachmentToArchiveJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CopyAttachmentToArchiveJob.kt @@ -187,13 +187,15 @@ class CopyAttachmentToArchiveJob private constructor(private val attachmentId: A Log.w(TAG, "[$attachmentId]$mediaIdLog Something is invalid about our request. Possibly the length. Scheduling a re-upload.") setArchiveTransferStateWithDelayedNotification(attachmentId, AttachmentTable.ArchiveTransferState.NONE) AppDependencies.jobManager.add(UploadAttachmentToArchiveJob(attachmentId, canReuseUpload = false)) - Result.success() + // Returning immediately to avoid marking the attachment as finished. + return Result.success() } is ArchiveError.CopyMediaError.SourceNotFound -> { Log.w(TAG, "[$attachmentId]$mediaIdLog The attachment no longer exists on the transit tier. Scheduling a re-upload.") setArchiveTransferStateWithDelayedNotification(attachmentId, AttachmentTable.ArchiveTransferState.NONE) AppDependencies.jobManager.add(UploadAttachmentToArchiveJob(attachmentId, canReuseUpload = false)) - Result.success() + // Returning immediately to avoid marking the attachment as finished. + return Result.success() } is ArchiveError.CopyMediaError.OutOfRemoteSpace -> { Log.w(TAG, "[$attachmentId]$mediaIdLog Insufficient storage space! Can't upload!")