From 1d0997379f20c8357e182c8185f81b6dee07f46a Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 26 Jul 2024 16:21:40 -0300 Subject: [PATCH] Add support for several BackupAlert sheet primary actions. --- .../backup/v2/ui/BackupAlertBottomSheet.kt | 15 +++++++++------ .../settings/app/chats/ChatsSettingsState.kt | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt index 8a0a3d2280..4a0c37803f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt @@ -38,8 +38,12 @@ import org.signal.core.ui.Icons import org.signal.core.ui.Previews import org.signal.core.ui.SignalPreview import org.thoughtcrime.securesms.R +import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData +import org.thoughtcrime.securesms.dependencies.AppDependencies +import org.thoughtcrime.securesms.jobs.BackupMessagesJob +import org.thoughtcrime.securesms.jobs.BackupRestoreMediaJob /** * Notifies the user of an issue with their backup. @@ -73,14 +77,13 @@ class BackupAlertBottomSheet : ComposeBottomSheetDialogFragment() { private fun performPrimaryAction() { when (backupAlert) { BackupAlert.COULD_NOT_COMPLETE_BACKUP -> { - // TODO [message-backups] -- Back up now + BackupMessagesJob.enqueue() + startActivity(AppSettingsActivity.remoteBackups(requireContext())) } BackupAlert.PAYMENT_PROCESSING -> Unit - BackupAlert.MEDIA_BACKUPS_ARE_OFF -> { - // TODO [message-backups] -- Download media now - } - BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> { - // TODO [message-backups] -- Download media now + BackupAlert.MEDIA_BACKUPS_ARE_OFF, BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> { + // TODO [message-backups] -- We need to force this to download everything. + AppDependencies.jobManager.add(BackupRestoreMediaJob()) } BackupAlert.DISK_FULL -> Unit } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsState.kt index 2f54a9a73f..27ef9e4fa0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsState.kt @@ -7,5 +7,5 @@ data class ChatsSettingsState( val useSystemEmoji: Boolean, val enterKeySends: Boolean, val localBackupsEnabled: Boolean, - val canAccessRemoteBackupsSettings: Boolean, + val canAccessRemoteBackupsSettings: Boolean )