From 0cfa4774ad144936d56e01729fe37dbd99a3b62c Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 13 Mar 2025 15:46:36 -0300 Subject: [PATCH] Do not display backups warnings if backups are disabled in remote configuration. --- .../components/settings/app/AppSettingsViewModel.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt index 9e07f69471..285abec305 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt @@ -14,6 +14,7 @@ import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.recipients.Recipient +import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.TextSecurePreferences import org.thoughtcrime.securesms.util.livedata.Store @@ -71,7 +72,9 @@ class AppSettingsViewModel : ViewModel() { } private fun getBackupFailureState(): BackupFailureState { - return if (BackupRepository.shouldDisplayBackupFailedSettingsRow()) { + return if (!RemoteConfig.messageBackups) { + BackupFailureState.NONE + } else if (BackupRepository.shouldDisplayBackupFailedSettingsRow()) { BackupFailureState.BACKUP_FAILED } else if (BackupRepository.shouldDisplayCouldNotCompleteBackupSettingsRow()) { BackupFailureState.COULD_NOT_COMPLETE_BACKUP