Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-24 02:39:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix blur hash for images and videos.

Browse Source
This commit is contained in:
Michelle Tang
2024-11-05 11:51:55 -05:00
committed by Greyson Parrelli
parent 98590295df
commit 39e91ffb6e
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt
View File

@@ -895,7 +895,8 @@ class AttachmentTableTest_deduping {
incrementalDigest = Random.nextBytes(16), incrementalDigest = Random.nextBytes(16),
incrementalDigestChunkSize = 5, incrementalDigestChunkSize = 5,
uploadTimestamp = uploadTimestamp, uploadTimestamp = uploadTimestamp,
dataSize = databaseAttachment.size dataSize = databaseAttachment.size,
blurHash = databaseAttachment.blurHash?.hash
) )
} }
} }

3
app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_synchronizeDeleteForMe.kt
View File

@@ -724,7 +724,8 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
incrementalDigest = this.incrementalDigest, incrementalDigest = this.incrementalDigest,
incrementalDigestChunkSize = this.incrementalMacChunkSize, incrementalDigestChunkSize = this.incrementalMacChunkSize,
dataSize = this.size, dataSize = this.size,
uploadTimestamp = uploadTimestamp uploadTimestamp = uploadTimestamp,
blurHash = this.blurHash?.hash
) )
} }
} }

3
app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
View File

@@ -1299,7 +1299,8 @@ class AttachmentTable(
REMOTE_INCREMENTAL_DIGEST_CHUNK_SIZE to uploadResult.incrementalDigestChunkSize, REMOTE_INCREMENTAL_DIGEST_CHUNK_SIZE to uploadResult.incrementalDigestChunkSize,
DATA_SIZE to uploadResult.dataSize, DATA_SIZE to uploadResult.dataSize,
DATA_HASH_END to dataHashEnd, 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!") val dataFilePath = getDataFilePath(id) ?: throw IOException("No data file found for attachment!")

3
libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentApi.kt
View File

@@ -107,7 +107,8 @@ class AttachmentApi(
incrementalDigest = digestInfo.incrementalDigest, incrementalDigest = digestInfo.incrementalDigest,
incrementalDigestChunkSize = digestInfo.incrementalMacChunkSize, incrementalDigestChunkSize = digestInfo.incrementalMacChunkSize,
uploadTimestamp = attachmentStream.uploadTimestamp, uploadTimestamp = attachmentStream.uploadTimestamp,
dataSize = attachmentStream.length dataSize = attachmentStream.length,
blurHash = attachmentStream.blurHash.get()
) )
} }
} }

3
libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentUploadResult.kt
View File

@@ -19,5 +19,6 @@ class AttachmentUploadResult(
val incrementalDigest: ByteArray?, val incrementalDigest: ByteArray?,
val incrementalDigestChunkSize: Int, val incrementalDigestChunkSize: Int,
val dataSize: Long, val dataSize: Long,
val uploadTimestamp: Long val uploadTimestamp: Long,
val blurHash: String?
) )