Fix crash when downloading attachment from S3.

greyson-signal · cody-signal · commit 7735ca9dab96 · 2024-09-13T10:51:30.000-04:00
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
@@ -981,9 +981,10 @@ class AttachmentTable(
       limitStream.leftoverStream().allMatch { it == 0x00.toByte() }
     }
 
-    val digest = if (paddingAllZeroes) {
+    // Existing digest may be null for non-user attachments, like things pulled from S3
+    val digest = if (existingPlaceholder.remoteDigest != null && paddingAllZeroes) {
       Log.d(TAG, "[finalizeAttachmentAfterDownload] $attachmentId has all-zero padding. Digest is good.")
-      existingPlaceholder.remoteDigest!!
+      existingPlaceholder.remoteDigest
     } else {
       Log.w(TAG, "[finalizeAttachmentAfterDownload] $attachmentId has non-zero padding bytes. Recomputing digest.")
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt
@@ -416,11 +416,15 @@ class AttachmentDownloadJob private constructor(
           if (body.contentLength() > RemoteConfig.maxAttachmentReceiveSizeBytes) {
             throw MmsException("Attachment too large, failing download")
           }
+
+          SignalDatabase.attachments.createKeyIvIfNecessary(attachmentId)
+          val updatedAttachment = SignalDatabase.attachments.getAttachment(attachmentId)!!
+
           SignalDatabase.attachments.finalizeAttachmentAfterDownload(
             messageId,
             attachmentId,
             LimitedInputStream.withoutLimits((body.source() as Source).buffer().inputStream()),
-            iv = null
+            iv = updatedAttachment.remoteIv
           )
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -416,11 +416,15 @@ class AttachmentDownloadJob private constructor(`
`416`	`416`	`if (body.contentLength() > RemoteConfig.maxAttachmentReceiveSizeBytes) {`
`417`	`417`	`throw MmsException("Attachment too large, failing download")`
`418`	`418`	`}`
	`419`	`+`
	`420`	`+ SignalDatabase.attachments.createKeyIvIfNecessary(attachmentId)`
	`421`	`+ val updatedAttachment = SignalDatabase.attachments.getAttachment(attachmentId)!!`
	`422`	`+`
`419`	`423`	`SignalDatabase.attachments.finalizeAttachmentAfterDownload(`
`420`	`424`	`messageId,`
`421`	`425`	`attachmentId,`
`422`	`426`	`LimitedInputStream.withoutLimits((body.source() as Source).buffer().inputStream()),`
`423`		`- iv = null`
	`427`	`+ iv = updatedAttachment.remoteIv`
`424`	`428`	`)`
`425`	`429`	`}`
`426`	`430`	`}`