From cf0dfdceb1e26164932507eb5a87ac7161a40b07 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 4 Jun 2025 13:32:51 -0300 Subject: [PATCH] Display resume over cellular only if awaiting wifi. --- .../app/backups/remote/RemoteBackupsSettingsFragment.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt index f2048bb842..0cf0361368 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt @@ -656,14 +656,19 @@ private fun LazyListScope.appendRestoreFromBackupStatusData( item { BackupStatusRow( backupStatusData = backupRestoreState.backupStatusData, - restoreType = RestoreType.DOWNLOAD, + restoreType = if (isCancelable) RestoreType.DOWNLOAD else RestoreType.RESTORE, onCancelClick = if (isCancelable) contentCallbacks::onCancelMediaRestore else null, onSkipClick = contentCallbacks::onDisplaySkipMediaRestoreProtectionDialog, onLearnMoreClick = contentCallbacks::onLearnMoreAboutBackupFailure ) } - if (!canRestoreUsingCellular) { + val displayResumeButton = when (val data = backupRestoreState.backupStatusData) { + is BackupStatusData.RestoringMedia -> !canRestoreUsingCellular && data.restoreStatus == BackupStatusData.RestoreStatus.WAITING_FOR_WIFI + else -> false + } + + if (displayResumeButton) { item { Rows.TextRow( text = stringResource(R.string.RemoteBackupsSettingsFragment__resume_download),