Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 04:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix progress bar stuck at 100% after successful backup restore.

Browse Source
This commit is contained in:
jeffrey-signal
2025-06-20 14:53:26 -04:00
committed by Cody Henthorne
parent 3b9dec5d42
commit eeae9579d9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsViewModel.kt
View File

@@ -13,8 +13,10 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.takeWhile import kotlinx.coroutines.flow.takeWhile
import kotlinx.coroutines.flow.update import kotlinx.coroutines.flow.update
import kotlinx.coroutines.isActive import kotlinx.coroutines.isActive
@@ -112,10 +114,9 @@ class RemoteBackupsSettingsViewModel : ViewModel() {
Log.d(TAG, "Backup is being restored. Collecting updates.") Log.d(TAG, "Backup is being restored. Collecting updates.")
restoreProgress restoreProgress
.dataFlow .dataFlow
.onEach { latest -> _restoreState.update { BackupRestoreState.FromBackupStatusData(latest) } }
.takeWhile { it !is BackupStatusData.RestoringMedia || it.restoreStatus != BackupStatusData.RestoreStatus.FINISHED } .takeWhile { it !is BackupStatusData.RestoringMedia || it.restoreStatus != BackupStatusData.RestoreStatus.FINISHED }
.collectLatest { latest -> .collect()
_restoreState.update { BackupRestoreState.FromBackupStatusData(latest) }
}
} else if ( } else if (
!SignalStore.backup.optimizeStorage && !SignalStore.backup.optimizeStorage &&
SignalStore.backup.userManuallySkippedMediaRestore && SignalStore.backup.userManuallySkippedMediaRestore &&