Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BackupState.DISABLED has been removed. Now when the value is UNKNOWN, the app need to invoke EncryptionService.doesBackupExistOnServer() to check if a Backup exists.

Browse source
This commit is contained in:
Benoit Marty 2023-11-17 17:31:22 +01:00
parent fe1ffe3aae
commit d352f14665
9 changed files with 57 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenter.kt
View file

@ -17,13 +17,18 @@
package io.element.android.features.securebackup.impl.root
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import io.element.android.features.securebackup.impl.loggerTagRoot
import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.core.meta.BuildMeta
import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarMessageAsState
import io.element.android.libraries.matrix.api.encryption.BackupState
import io.element.android.libraries.matrix.api.encryption.EncryptionService
import timber.log.Timber
import javax.inject.Inject
@ -44,8 +49,20 @@ class SecureBackupRootPresenter @Inject constructor(
Timber.tag(loggerTagRoot.value).d("backupState: $backupState")
Timber.tag(loggerTagRoot.value).d("recoveryState: $recoveryState")
var doesBackupExistOnServer: Boolean? by remember { mutableStateOf(null) }
LaunchedEffect(backupState) {
doesBackupExistOnServer = if (backupState == BackupState.UNKNOWN) {
encryptionService.doesBackupExistOnServer().getOrNull() == true
} else {
// The value will not be used when the backupState is not UNKNOWN.
false
}
}
return SecureBackupRootState(
backupState = backupState,
doesBackupExistOnServer = doesBackupExistOnServer,
recoveryState = recoveryState,
appName = buildMeta.applicationName,
snackbarMessage = snackbarMessage,

1
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootState.kt
View file

@ -22,6 +22,7 @@ import io.element.android.libraries.matrix.api.encryption.RecoveryState
data class SecureBackupRootState(
val backupState: BackupState,
val doesBackupExistOnServer: Boolean?,
val recoveryState: RecoveryState,
val appName: String,
val snackbarMessage: SnackbarMessage?,

7
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootStateProvider.kt
View file

@ -24,9 +24,10 @@ import io.element.android.libraries.matrix.api.encryption.RecoveryState
open class SecureBackupRootStateProvider : PreviewParameterProvider<SecureBackupRootState> {
override val values: Sequence<SecureBackupRootState>
get() = sequenceOf(
aSecureBackupRootState(backupState = BackupState.UNKNOWN),
aSecureBackupRootState(backupState = BackupState.UNKNOWN, doesBackupExistOnServer = null),
aSecureBackupRootState(backupState = BackupState.UNKNOWN, doesBackupExistOnServer = true),
aSecureBackupRootState(backupState = BackupState.UNKNOWN, doesBackupExistOnServer = false),
aSecureBackupRootState(backupState = BackupState.ENABLED),
aSecureBackupRootState(backupState = BackupState.DISABLED),
aSecureBackupRootState(recoveryState = RecoveryState.UNKNOWN),
aSecureBackupRootState(recoveryState = RecoveryState.ENABLED),
aSecureBackupRootState(recoveryState = RecoveryState.DISABLED),
@ -37,10 +38,12 @@ open class SecureBackupRootStateProvider : PreviewParameterProvider<SecureBackup
fun aSecureBackupRootState(
backupState: BackupState = BackupState.UNKNOWN,
doesBackupExistOnServer: Boolean? = true,
recoveryState: RecoveryState = RecoveryState.UNKNOWN,
snackbarMessage: SnackbarMessage? = null,
) = SecureBackupRootState(
backupState = backupState,
doesBackupExistOnServer = doesBackupExistOnServer,
recoveryState = recoveryState,
appName = "Element",
snackbarMessage = snackbarMessage,

28
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt
View file

@ -70,13 +70,27 @@ fun SecureBackupRootView(
// Disable / Enable backup
when (state.backupState) {
BackupState.WAITING_FOR_SYNC,
BackupState.UNKNOWN -> Unit
BackupState.DISABLED -> {
PreferenceText(
title = stringResource(id = R.string.screen_chat_backup_key_backup_action_enable),
onClick = onEnableClicked,
)
BackupState.WAITING_FOR_SYNC -> Unit
BackupState.UNKNOWN -> {
when (state.doesBackupExistOnServer) {
true -> {
// Should not happen, we will have the state BackupState.ENABLED
PreferenceText(
title = stringResource(id = R.string.screen_chat_backup_key_backup_action_disable),
tintColor = ElementTheme.colors.textCriticalPrimary,
onClick = onDisableClicked,
)
}
false -> {
PreferenceText(
title = stringResource(id = R.string.screen_chat_backup_key_backup_action_enable),
onClick = onEnableClicked,
)
}
null -> {
AsyncLoading()
}
}
}
BackupState.CREATING,
BackupState.ENABLING,