mobi/seedvault
1
0
Fork 0
Code Pull requests Activity

Fix crash that happens when starting RestoreActivity without key

Browse source 
This instantiates all sorts of classes down to Restore which accessed the streamKey that is still unavailable at this point. Now it is only instantiated lazily when actually starting a restore.
This commit is contained in:
Torsten Grote 2021-07-01 17:10:27 -03:00 • committed by Chirayu Desai
parent 781bcd28d3
commit 056bdc3bf3
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
storage/lib/src/main/java/org/calyxos/backup/storage/restore/Restore.kt
View file

@ -30,18 +30,27 @@ internal class Restore(
streamCrypto: StreamCrypto = StreamCrypto,
) {
private val streamKey = try {
streamCrypto.deriveStreamKey(storagePlugin.getMasterKey())
} catch (e: GeneralSecurityException) {
throw AssertionError(e)
private val streamKey by lazy {
// This class might get instantiated before the StoragePlugin had time to provide the key
// so we need to get it lazily here to prevent crashes. We can still crash later,
// if the plugin is not providing a key as it should when performing calls into this class.
try {
streamCrypto.deriveStreamKey(storagePlugin.getMasterKey())
} catch (e: GeneralSecurityException) {
throw AssertionError(e)
}
}
private val zipChunkRestore =
// lazily instantiate these, so they don't try to get the streamKey too early
private val zipChunkRestore by lazy {
ZipChunkRestore(storagePlugin, fileRestore, streamCrypto, streamKey)
private val singleChunkRestore =
}
private val singleChunkRestore by lazy {
SingleChunkRestore(storagePlugin, fileRestore, streamCrypto, streamKey)
private val multiChunkRestore =
}
private val multiChunkRestore by lazy {
MultiChunkRestore(context, storagePlugin, fileRestore, streamCrypto, streamKey)
}
fun getBackupSnapshots(): Flow<SnapshotResult> = flow {
val numSnapshots: Int