Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 19:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guard against invalid attachment states when copying to archive.

Browse Source 
Fixes #14461
This commit is contained in:
Greyson Parrelli
2025-12-02 14:52:16 -05:00
committed by jeffrey-signal
parent 706d89db87
commit 30e43e99fc
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/thoughtcrime/securesms/jobs/CopyAttachmentToArchiveJob.kt
View File

@@ -123,9 +123,18 @@ class CopyAttachmentToArchiveJob private constructor(private val attachmentId: A
return Result.success() return Result.success()
} }
if (isCanceled) { if (attachment.cdn !in ALLOWED_SOURCE_CDNS) {
Log.w(TAG, "[$attachmentId] Canceled. Refusing to proceed.") Log.i(TAG, "[$attachmentId] Attachment CDN (${attachment.cdn}) is not in allowed source CDNs. Enqueueing an upload job instead.")
return Result.failure() setArchiveTransferStateWithDelayedNotification(attachmentId, AttachmentTable.ArchiveTransferState.NONE)
AppDependencies.jobManager.add(UploadAttachmentToArchiveJob(attachmentId, canReuseUpload = false))
return Result.success()
}
if (attachment.remoteLocation == null) {
Log.i(TAG, "[$attachmentId] Attachment has no remote location. Enqueueing an upload job instead.")
setArchiveTransferStateWithDelayedNotification(attachmentId, AttachmentTable.ArchiveTransferState.NONE)
AppDependencies.jobManager.add(UploadAttachmentToArchiveJob(attachmentId, canReuseUpload = false))
return Result.success()
} }
if (attachment.archiveTransferState == AttachmentTable.ArchiveTransferState.NONE) { if (attachment.archiveTransferState == AttachmentTable.ArchiveTransferState.NONE) {
@@ -134,6 +143,11 @@ class CopyAttachmentToArchiveJob private constructor(private val attachmentId: A
return Result.success() return Result.success()
} }
if (isCanceled) {
Log.w(TAG, "[$attachmentId] Canceled. Refusing to proceed.")
return Result.failure()
}
val result = when (val archiveResult = BackupRepository.copyAttachmentToArchive(attachment)) { val result = when (val archiveResult = BackupRepository.copyAttachmentToArchive(attachment)) {
is NetworkResult.Success -> { is NetworkResult.Success -> {
Log.i(TAG, "[$attachmentId] Successfully copied the archive tier.") Log.i(TAG, "[$attachmentId] Successfully copied the archive tier.")