Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-28 13:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce error noise when failing to restore an attachment that was intentionally never uploaded.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-11-06 15:32:35 -05:00
committed by Michelle Tang
parent 0c0e1600e6
commit c8e0ba8194
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt
View File

@@ -458,16 +458,22 @@ class RestoreAttachmentJob private constructor(
when (e.code) {
404 -> {
if (forceTransitTier) {
Log.w(TAG, "[$attachmentId] Completely failed to restore an attachment! Failed downloading from both the archive and transit CDN.")
maybePostFailedToDownloadFromArchiveAndTransitNotification()
Log.w(TAG, "[$attachmentId] Completely failed to restore an attachment! Failed downloading from both the archive and transit CDN. hasPlaintextHash: ${attachment.dataHash != null}")
if (attachment.dataHash != null) {
maybePostFailedToDownloadFromArchiveAndTransitNotification()
}
} else if (SignalStore.backup.backsUpMedia && attachment.remoteLocation.isNotNullOrBlank()) {
Log.w(TAG, "[$attachmentId] Failed to download attachment from the archive CDN! Retrying download from transit CDN.")
maybePostFailedToDownloadFromArchiveNotification()
Log.w(TAG, "[$attachmentId] Failed to download attachment from the archive CDN! Retrying download from transit CDN. hasPlaintextHash: ${attachment.dataHash != null}")
if (attachment.dataHash != null) {
maybePostFailedToDownloadFromArchiveNotification()
}
return retrieveAttachment(messageId, attachmentId, attachment, forceTransitTier = true)
} else if (SignalStore.backup.backsUpMedia) {
Log.w(TAG, "[$attachmentId] Completely failed to restore an attachment! Failed to download from archive CDN, and there's not transit CDN info.")
maybePostFailedToDownloadFromArchiveAndTransitNotification()
Log.w(TAG, "[$attachmentId] Completely failed to restore an attachment! Failed to download from archive CDN, and there's not transit CDN info. hasPlaintextHash: ${attachment.dataHash != null}")
if (attachment.dataHash != null) {
maybePostFailedToDownloadFromArchiveAndTransitNotification()
}
} else if (attachment.remoteLocation.isNotNullOrBlank()) {
Log.w(TAG, "[$attachmentId] Failed to restore an attachment for a free tier user. Likely just older than 45 days.")
}