diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt index 771c871b20..907de22406 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt @@ -895,7 +895,8 @@ class AttachmentTableTest_deduping { incrementalDigest = Random.nextBytes(16), incrementalDigestChunkSize = 5, uploadTimestamp = uploadTimestamp, - dataSize = databaseAttachment.size + dataSize = databaseAttachment.size, + blurHash = databaseAttachment.blurHash?.hash ) } } diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_synchronizeDeleteForMe.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_synchronizeDeleteForMe.kt index 30c02e80df..13416dafc4 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_synchronizeDeleteForMe.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_synchronizeDeleteForMe.kt @@ -724,7 +724,8 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe { incrementalDigest = this.incrementalDigest, incrementalDigestChunkSize = this.incrementalMacChunkSize, dataSize = this.size, - uploadTimestamp = uploadTimestamp + uploadTimestamp = uploadTimestamp, + blurHash = this.blurHash?.hash ) } } 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 4f3be716fd..85cc940c44 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt @@ -1299,7 +1299,8 @@ class AttachmentTable( REMOTE_INCREMENTAL_DIGEST_CHUNK_SIZE to uploadResult.incrementalDigestChunkSize, DATA_SIZE to uploadResult.dataSize, DATA_HASH_END to dataHashEnd, - UPLOAD_TIMESTAMP to uploadResult.uploadTimestamp + UPLOAD_TIMESTAMP to uploadResult.uploadTimestamp, + BLUR_HASH to uploadResult.blurHash ) val dataFilePath = getDataFilePath(id) ?: throw IOException("No data file found for attachment!") diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentApi.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentApi.kt index a83757e2ea..2abef8c815 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentApi.kt +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentApi.kt @@ -107,7 +107,8 @@ class AttachmentApi( incrementalDigest = digestInfo.incrementalDigest, incrementalDigestChunkSize = digestInfo.incrementalMacChunkSize, uploadTimestamp = attachmentStream.uploadTimestamp, - dataSize = attachmentStream.length + dataSize = attachmentStream.length, + blurHash = attachmentStream.blurHash.get() ) } } diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentUploadResult.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentUploadResult.kt index 7f358b48ed..67a27d74da 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentUploadResult.kt +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentUploadResult.kt @@ -19,5 +19,6 @@ class AttachmentUploadResult( val incrementalDigest: ByteArray?, val incrementalDigestChunkSize: Int, val dataSize: Long, - val uploadTimestamp: Long + val uploadTimestamp: Long, + val blurHash: String? )