Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-03-01 14:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep remote fields in sync when deduping downloads.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-09-24 16:39:59 -04:00
parent 8030e9f7eb
commit bf338a6835
2 changed files with 92 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1140,8 +1140,13 @@ class AttachmentTable(
values.put(TRANSFER_FILE, null as String?)
values.put(TRANSFORM_PROPERTIES, TransformProperties.forSkipTransform().serialize())
values.put(ARCHIVE_TRANSFER_FILE, null as String?)
values.put(REMOTE_LOCATION, existingPlaceholder.remoteLocation)
values.put(CDN_NUMBER, existingPlaceholder.cdn.serialize())
values.put(REMOTE_KEY, existingPlaceholder.remoteKey!!)
values.put(REMOTE_IV, iv)
values.put(REMOTE_DIGEST, digest)
values.put(REMOTE_INCREMENTAL_DIGEST, existingPlaceholder.incrementalDigest)
values.put(REMOTE_INCREMENTAL_DIGEST_CHUNK_SIZE, existingPlaceholder.incrementalMacChunkSize)
if (digestChanged) {
values.put(UPLOAD_TIMESTAMP, 0)
@@ -1151,9 +1156,11 @@ class AttachmentTable(
values.put(OFFLOAD_RESTORED_AT, offloadRestoredAt.inWholeMilliseconds)
}
val dataFilePath = hashMatch?.file?.absolutePath ?: fileWriteResult.file.absolutePath
db.update(TABLE_NAME)
.values(values)
.where("$ID = ?", attachmentId.id)
.where("$ID = ? OR $DATA_FILE = ?", attachmentId.id, dataFilePath)
.run()
Log.i(TAG, "[finalizeAttachmentAfterDownload] Finalized downloaded data for $attachmentId. (MessageId: $mmsId, $attachmentId)")