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 9fed66be19..c3ebcd348f 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 @@ -922,7 +922,9 @@ private fun LazyListScope.appendBackupDetailsItems( } } - if (backupProgress == null || backupProgress.state == ArchiveUploadProgressState.State.None || backupProgress.state == ArchiveUploadProgressState.State.UserCanceled) { + + val isRestoringDatabase = backupRestoreState is BackupRestoreState.Restoring && backupRestoreState.state.restoreState == RestoreState.RESTORING_DB + if (!isRestoringDatabase && (backupProgress == null || backupProgress.state == ArchiveUploadProgressState.State.None || backupProgress.state == ArchiveUploadProgressState.State.UserCanceled)) { item { LastBackupRow( lastBackupTimestamp = state.lastBackupTimestamp, @@ -931,7 +933,7 @@ private fun LazyListScope.appendBackupDetailsItems( onBackupNowClick = contentCallbacks::onBackupNowClick ) } - } else { + } else if (backupProgress != null) { item { InProgressBackupRow( archiveUploadProgressState = backupProgress,