From d7da56b82faa62061894fb61cf9df3037920dc84 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 12 Sep 2025 15:10:14 -0400
Subject: [PATCH] Temporarily disable reconciliation deletes.

---
 .../jobs/ArchiveAttachmentReconciliationJob.kt | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentReconciliationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentReconciliationJob.kt
index 88cf055f3b..bb8cea527a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentReconciliationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentReconciliationJob.kt
@@ -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
   }