Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 08:09:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fail gracefully when crash occurs during backup restore.

Browse Source
This commit is contained in:
Cody Henthorne
2025-10-29 11:35:24 -04:00
committed by jeffrey-signal
parent 1a39119c2b
commit e690c54f7c
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1129,20 +1129,25 @@ object BackupRepository {
forwardSecrecyToken: BackupForwardSecrecyToken,
cancellationSignal: () -> Boolean = { false }
): ImportResult {
val frameReader = if (backupKey == null) {
PlainTextBackupReader(inputStreamFactory(), length)
} else {
EncryptedBackupReader.createForSignalBackup(
key = backupKey,
aci = selfData.aci,
forwardSecrecyToken = forwardSecrecyToken,
length = length,
dataStream = inputStreamFactory
)
}
try {
val frameReader = if (backupKey == null) {
PlainTextBackupReader(inputStreamFactory(), length)
} else {
EncryptedBackupReader.createForSignalBackup(
key = backupKey,
aci = selfData.aci,
forwardSecrecyToken = forwardSecrecyToken,
length = length,
dataStream = inputStreamFactory
)
}
return frameReader.use { reader ->
import(reader, selfData, cancellationSignal)
return frameReader.use { reader ->
import(reader, selfData, cancellationSignal)
}
} catch (e: IOException) {
Log.w(TAG, "Unable to restore signal backup", e)
return ImportResult.Failure
}
}