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

Fix reconciliation error for thumbnails for quotes.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-04-06 14:23:23 +00:00
committed by Cody Henthorne
parent 3ea7bf77e0
commit 8f47592fc0
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -422,26 +422,45 @@ class AttachmentTable(
}
/**
* Returns a list that has any permanently-failed thumbnails removed.
* Filters thumbnail snapshot entries down to only those that have at least one eligible attachment capable of thumbnail upload.
*/
fun filterPermanentlyFailedThumbnails(entries: Set<BackupMediaSnapshotTable.MediaEntry>): Set<BackupMediaSnapshotTable.MediaEntry> {
fun filterThumbnailsWithoutEligibleAttachment(entries: Set<BackupMediaSnapshotTable.MediaEntry>): Set<BackupMediaSnapshotTable.MediaEntry> {
if (entries.isEmpty()) {
return entries
}
val entriesByMediaName: MutableMap<String, BackupMediaSnapshotTable.MediaEntry> = entries
.associateBy { MediaName.fromPlaintextHashAndRemoteKeyForThumbnail(it.plaintextHash, it.remoteKey).name }
.toMutableMap()
val eligibleMediaNames: MutableSet<String> = mutableSetOf()
readableDatabase
.select(DATA_HASH_END, REMOTE_KEY)
.from(TABLE_NAME)
.where("$DATA_HASH_END NOT NULL AND $REMOTE_KEY NOT NULL AND $ARCHIVE_THUMBNAIL_TRANSFER_STATE = ${ArchiveTransferState.PERMANENT_FAILURE.value}")
.where(
"""
$DATA_HASH_END NOT NULL AND
$REMOTE_KEY NOT NULL AND
$DATA_FILE NOT NULL AND
$TRANSFER_STATE = $TRANSFER_PROGRESS_DONE AND
$QUOTE = 0 AND
$ARCHIVE_THUMBNAIL_TRANSFER_STATE != ${ArchiveTransferState.PERMANENT_FAILURE.value}
"""
)
.run()
.forEach { cursor ->
val hashEnd = cursor.requireNonNullString(DATA_HASH_END)
val remoteKey = cursor.requireNonNullString(REMOTE_KEY)
val thumbnailMediaName = MediaName.fromPlaintextHashAndRemoteKeyForThumbnail(Base64.decode(hashEnd), Base64.decode(remoteKey)).name
entriesByMediaName.remove(thumbnailMediaName)
if (thumbnailMediaName in entriesByMediaName) {
eligibleMediaNames += thumbnailMediaName
}
}
entriesByMediaName.keys.retainAll(eligibleMediaNames)
return entriesByMediaName.values.toSet()
}

2
app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt
View File

@@ -617,7 +617,7 @@ class BackupMessagesJob private constructor(
)
}
.toSet()
.let { SignalDatabase.attachments.filterPermanentlyFailedThumbnails(it) }
.let { SignalDatabase.attachments.filterThumbnailsWithoutEligibleAttachment(it) }
}
class Factory : Job.Factory<BackupMessagesJob> {