mobi/seedvault
1
0
Fork 0
Code Pull requests Activity

Improve error reporting when reading snapshot version

Browse source
This commit is contained in:
Torsten Grote 2024-02-12 10:45:38 -03:00 committed by Chirayu Desai
parent fd90be8776
commit dc7405474e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -154,13 +154,13 @@ internal class Restore(
@Throws(IOException::class, GeneralSecurityException::class) @Throws(IOException::class, GeneralSecurityException::class)
internal fun InputStream.readVersion(expectedVersion: Int? = null): Int { internal fun InputStream.readVersion(expectedVersion: Int? = null): Int {
val version = read() val version = read()
if (version == -1) throw IOException() if (version == -1) throw IOException("File empty!")
if (expectedVersion != null && version != expectedVersion) { if (expectedVersion != null && version != expectedVersion) {
throw GeneralSecurityException("Expected version $expectedVersion, not $version") throw GeneralSecurityException("Expected version $expectedVersion, not $version")
} }
if (version > Backup.VERSION) { if (version > Backup.VERSION) {
// TODO maybe throw a different exception here and tell the user? // TODO maybe throw a different exception here and tell the user?
throw IOException() throw IOException("Got version $version which is higher than what is supported.")
} }
return version return version
} }