From 7a0b7c045ebf4c358477aaf77c8b962cbfb884ad Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 26 Jun 2025 10:55:04 -0300 Subject: [PATCH] Only display failure sheet if there is actually a failure reported. --- .../org/thoughtcrime/securesms/backup/v2/BackupRepository.kt | 2 +- .../java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt index 483629e397..d3e70e9839 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt @@ -530,7 +530,7 @@ object BackupRepository { return false } - return !SignalStore.backup.hasBackupBeenUploaded && System.currentTimeMillis().milliseconds > SignalStore.backup.nextBackupFailureSheetSnoozeTime + return !SignalStore.backup.hasBackupBeenUploaded && SignalStore.backup.hasBackupFailure && System.currentTimeMillis().milliseconds > SignalStore.backup.nextBackupFailureSheetSnoozeTime } /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt index 3bca9202b1..2ee637375c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt @@ -339,6 +339,7 @@ class BackupValues(store: KeyValueStore) : SignalStoreValues(store) { .putBoolean(KEY_BACKUP_FAIL, true) .putLong(KEY_BACKUP_FAIL_ACKNOWLEDGED_SNOOZE_TIME, System.currentTimeMillis()) .putLong(KEY_BACKUP_FAIL_ACKNOWLEDGED_SNOOZE_COUNT, 0) + .putLong(KEY_BACKUP_FAIL_SHEET_SNOOZE_TIME, System.currentTimeMillis()) .apply() }