Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 10:20:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use trailing job to clear media restore progress.

Browse Source
This commit is contained in:
Cody Henthorne
2024-09-05 14:18:04 -04:00
parent 390ea341ca
commit 2701b570bb
6 changed files with 92 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,12 +331,17 @@ object BackupRepository {
fun localImport(mainStreamFactory: () -> InputStream, mainStreamLength: Long, selfData: SelfData): ImportResult {
val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
val frameReader = EncryptedBackupReader(
key = backupKey,
aci = selfData.aci,
length = mainStreamLength,
dataStream = mainStreamFactory
)
val frameReader = try {
EncryptedBackupReader(
key = backupKey,
aci = selfData.aci,
length = mainStreamLength,
dataStream = mainStreamFactory
)
} catch (e: IOException) {
Log.w(TAG, "Unable to import local archive", e)
return ImportResult.Failure
}
return frameReader.use { reader ->
import(backupKey, reader, selfData)