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

Ensure that restore status gets reset on failure.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-11-13 11:47:03 -05:00
committed by Cody Henthorne
parent 9997ac2ef9
commit 2a3888472f
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/backup/v2/ArchiveRestoreProgress.kt
View File

@@ -91,6 +91,12 @@ object ArchiveRestoreProgress {
update()
}
fun onRestoreFailed() {
Log.i(TAG, "onRestoreFailed")
SignalStore.backup.restoreState = RestoreState.NONE
update()
}
fun onStartMediaRestore() {
Log.i(TAG, "onStartMediaRestore")
SignalStore.backup.restoreState = RestoreState.CALCULATING_MEDIA

6
app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
View File

@@ -2151,9 +2151,13 @@ object BackupRepository {
try {
DataRestoreConstraint.isRestoringData = true
return withContext(Dispatchers.IO) {
return@withContext BackupProgressService.start(context, context.getString(R.string.BackupProgressService_title)).use {
val result = BackupProgressService.start(context, context.getString(R.string.BackupProgressService_title)).use {
restoreRemoteBackup(controller = it, cancellationSignal = { !isActive })
}
if (result !is RemoteRestoreResult.Success) {
ArchiveRestoreProgress.onRestoreFailed()
}
return@withContext result
}
} finally {
DataRestoreConstraint.isRestoringData = false