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

Merge pull request #2012 from element-hq/feature/bma/uploadedState

Browse source 
Consider that the state is Done when the state is `Uploading` with `backedUpCount == totalCount`
This commit is contained in:
Benoit Marty 2023-12-13 17:47:41 +01:00 • committed by GitHub
commit a97a9f95f9
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapper.kt
View file

@ -24,11 +24,20 @@ class BackupUploadStateMapper {
return when (rustEnableProgress) { return when (rustEnableProgress) {
RustBackupUploadState.Done -> RustBackupUploadState.Done ->
BackupUploadState.Done BackupUploadState.Done
is RustBackupUploadState.Uploading -> is RustBackupUploadState.Uploading -> {
BackupUploadState.Uploading( val backedUpCount = rustEnableProgress.backedUpCount.toInt()
backedUpCount = rustEnableProgress.backedUpCount.toInt(), val totalCount = rustEnableProgress.totalCount.toInt()
totalCount = rustEnableProgress.totalCount.toInt(), if (backedUpCount == totalCount) {
) // Consider that the state is Done in this case,
// the SDK will not send a Done state
BackupUploadState.Done
} else {
BackupUploadState.Uploading(
backedUpCount = backedUpCount,
totalCount = totalCount,
)
}
}
RustBackupUploadState.Waiting -> RustBackupUploadState.Waiting ->
BackupUploadState.Waiting BackupUploadState.Waiting
RustBackupUploadState.Error -> RustBackupUploadState.Error ->