empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update downloadAttachmentIfNeeded() to use a when expression.

Browse source
This commit is contained in:
Nicholas Tinsley 2024-08-09 12:04:43 -04:00 • committed by mtang-signal
parent 263690d3e2
commit 32a00b5c75
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt
View file

@ -87,22 +87,32 @@ class AttachmentDownloadJob private constructor(
@JvmStatic
fun downloadAttachmentIfNeeded(databaseAttachment: DatabaseAttachment): String? {
if (databaseAttachment.transferState == AttachmentTable.TRANSFER_RESTORE_OFFLOADED) {
return RestoreAttachmentJob.restoreOffloadedAttachment(databaseAttachment)
} else if (databaseAttachment.transferState != AttachmentTable.TRANSFER_PROGRESS_STARTED &&
databaseAttachment.transferState != AttachmentTable.TRANSFER_PROGRESS_DONE &&
databaseAttachment.transferState != AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE
) {
val downloadJob = AttachmentDownloadJob(
messageId = databaseAttachment.mmsId,
attachmentId = databaseAttachment.attachmentId,
manual = true,
forceArchiveDownload = false
)
AppDependencies.jobManager.add(downloadJob)
return downloadJob.id
return when (val transferState = databaseAttachment.transferState) {
AttachmentTable.TRANSFER_RESTORE_OFFLOADED -> RestoreAttachmentJob.restoreOffloadedAttachment(databaseAttachment)
AttachmentTable.TRANSFER_PROGRESS_PENDING,
AttachmentTable.TRANSFER_PROGRESS_FAILED,
AttachmentTable.TRANSFER_NEEDS_RESTORE,
AttachmentTable.TRANSFER_RESTORE_IN_PROGRESS -> {
val downloadJob = AttachmentDownloadJob(
messageId = databaseAttachment.mmsId,
attachmentId = databaseAttachment.attachmentId,
manual = true,
forceArchiveDownload = false
)
AppDependencies.jobManager.add(downloadJob)
downloadJob.id
}
AttachmentTable.TRANSFER_PROGRESS_DONE,
AttachmentTable.TRANSFER_PROGRESS_STARTED,
AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE -> null
else -> {
Log.w(TAG, "Attempted to download attachment with unknown transfer state: $transferState")
null
}
}
return null
}
}