From 898392dde21cce181fb4f7222665a3636e8efc3d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 31 Oct 2023 13:53:46 +0100 Subject: [PATCH] Map new state `BackupUploadState.Error` --- .../io/element/android/features/logout/impl/LogoutView.kt | 3 ++- .../libraries/matrix/api/encryption/BackupUploadState.kt | 2 ++ .../matrix/impl/encryption/BackupUploadStateMapper.kt | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt index 7fc05886d0..7a8b4599bb 100644 --- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt +++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt @@ -161,7 +161,8 @@ private fun BackupUploadState.isBackingUp(): Boolean { BackupUploadState.Waiting, is BackupUploadState.Uploading, is BackupUploadState.CheckingIfUploadNeeded -> true - BackupUploadState.Done -> false + BackupUploadState.Done, + BackupUploadState.Error -> false } } diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/BackupUploadState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/BackupUploadState.kt index 4424db4684..2035dc71a1 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/BackupUploadState.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/BackupUploadState.kt @@ -32,4 +32,6 @@ sealed interface BackupUploadState { ) : BackupUploadState data object Done : BackupUploadState + + data object Error : BackupUploadState } diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapper.kt index 71bc8a081a..9ac5330294 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapper.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapper.kt @@ -36,6 +36,8 @@ class BackupUploadStateMapper { ) RustBackupUploadState.Waiting -> BackupUploadState.Waiting + RustBackupUploadState.Error -> + BackupUploadState.Error } } }