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

Temporarily disable reconciliation deletes.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-09-12 15:10:14 -04:00
committed by Cody Henthorne
parent d9cfdd1b32
commit d7da56b82f
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentReconciliationJob.kt
View File

@@ -267,9 +267,10 @@ class ArchiveAttachmentReconciliationJob private constructor(
val mediaOnRemoteButNotLocal = SignalDatabase.backupMediaSnapshots.getMediaObjectsThatCantBeFound(mediaObjects)
val mediaObjectsOnBothRemoteAndLocal = mediaObjects - mediaOnRemoteButNotLocal
if (RemoteConfig.internalUser && mediaOnRemoteButNotLocal.isNotEmpty()) {
Log.w(TAG, "MediaIds of items on remote but not local: ${mediaOnRemoteButNotLocal.joinToString(", ") { it.mediaId }}", true)
}
// TODO [backups] Temporarily remove deletes
// if (RemoteConfig.internalUser && mediaOnRemoteButNotLocal.isNotEmpty()) {
// Log.w(TAG, "MediaIds of items on remote but not local: ${mediaOnRemoteButNotLocal.joinToString(", ") { it.mediaId }}", true)
// }
val cdnMismatches = SignalDatabase.backupMediaSnapshots.getMediaObjectsWithNonMatchingCdn(mediaObjectsOnBothRemoteAndLocal)
if (cdnMismatches.isNotEmpty()) {
@@ -279,11 +280,12 @@ class ArchiveAttachmentReconciliationJob private constructor(
}
}
val deleteResult = ArchiveCommitAttachmentDeletesJob.deleteMediaObjectsFromCdn(TAG, mediaOnRemoteButNotLocal, this::defaultBackoff, this::isCanceled)
if (deleteResult != null) {
Log.w(TAG, "Failed to delete orphaned attachments from the CDN. Returning failure.")
return deleteResult
}
// TODO [backups] Temporarily remove deletes
// val deleteResult = ArchiveCommitAttachmentDeletesJob.deleteMediaObjectsFromCdn(TAG, mediaOnRemoteButNotLocal, this::defaultBackoff, this::isCanceled)
// if (deleteResult != null) {
// Log.w(TAG, "Failed to delete orphaned attachments from the CDN. Returning failure.")
// return deleteResult
// }
return null
}