From a6c215801b4063d9f54bb44bcfb33b90ff6ffff4 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 5 Sep 2025 16:42:07 -0400 Subject: [PATCH] Delay the first archive reconciliation. --- .../securesms/jobs/ArchiveAttachmentReconciliationJob.kt | 6 ++++++ .../securesms/logsubmit/LogSectionRemoteBackups.kt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 71868ada21..231b8044d0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentReconciliationJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentReconciliationJob.kt @@ -81,6 +81,12 @@ class ArchiveAttachmentReconciliationJob private constructor( return Result.success() } + if (SignalStore.backup.lastAttachmentReconciliationTime < 0) { + Log.w(TAG, "First ever time we're attempting a reconciliation. Setting the last sync time to now, so we'll run at the proper interval. Skipping this iteration.") + SignalStore.backup.lastAttachmentReconciliationTime = System.currentTimeMillis() + return Result.success() + } + val timeSinceLastSync = System.currentTimeMillis() - SignalStore.backup.lastAttachmentReconciliationTime if (!forced && serverCursor == null && timeSinceLastSync > 0 && timeSinceLastSync < RemoteConfig.archiveReconciliationSyncInterval.inWholeMilliseconds) { Log.d(TAG, "No need to do a remote sync yet. Time since last sync: $timeSinceLastSync ms") diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt index 069b3af1ba..96be28cfe6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt @@ -32,7 +32,7 @@ class LogSectionRemoteBackups : LogSection { output.append("Backup override tier: ${SignalStore.backup.backupTierInternalOverride}\n") output.append("Last backup time: ${SignalStore.backup.lastBackupTime}\n") output.append("Last check-in: ${SignalStore.backup.lastCheckInMillis}\n") - output.append("Last media sync: ${SignalStore.backup.lastAttachmentReconciliationTime}\n") + output.append("Last reconciliation time: ${SignalStore.backup.lastAttachmentReconciliationTime}\n") output.append("Days since last backup: ${SignalStore.backup.daysSinceLastBackup}\n") output.append("User manually skipped media restore: ${SignalStore.backup.userManuallySkippedMediaRestore}\n") output.append("Can backup with cellular: ${SignalStore.backup.backupWithCellular}\n")