diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt index 4675ecf315..e74c6cedd8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt @@ -26,6 +26,7 @@ import org.thoughtcrime.securesms.keyvalue.isDecisionPending import org.thoughtcrime.securesms.providers.BlobProvider import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.storage.StorageSyncHelper +import org.thoughtcrime.securesms.util.RemoteConfig import org.whispersystems.signalservice.api.NetworkResult import org.whispersystems.signalservice.api.messages.AttachmentTransferProgress import org.whispersystems.signalservice.api.messages.SignalServiceAttachment @@ -55,6 +56,11 @@ class BackupMessagesJob private constructor( private fun isBackupAllowed(): Boolean { return when { + !RemoteConfig.messageBackups -> { + Log.i(TAG, "Remote config for backups is disabled.") + false + } + SignalStore.registration.restoreDecisionState.isDecisionPending -> { Log.i(TAG, "Backup not allowed: a restore decision is pending.") false 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 4fa6b548fe..d2dca763b4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt @@ -24,6 +24,7 @@ class LogSectionRemoteBackups : LogSection { output.append("Enabled: ${SignalStore.backup.areBackupsEnabled}\n") output.append("Current tier: ${SignalStore.backup.backupTier}\n") output.append("Latest tier: ${SignalStore.backup.latestBackupTier}\n") + 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")