filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3656 from SpiritCroc/broken_downloads 

Avoid incomplete downloads in cache
This commit is contained in:
Benoit Marty 2021-07-19 10:50:52 +02:00 committed by GitHub
parent f51769174d 512e1b339d
commit 2e64f89ec6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/3656.bugfix Normal file
View File

@ -0,0 +1 @@
Avoid incomplete downloads in cache

16
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
View File

@ -131,8 +131,14 @@ internal class DefaultFileService @Inject constructor(
Timber.v("Response size ${response.body?.contentLength()} - Stream available: ${!source.exhausted()}")
// Write the file to cache (encrypted version if the file is encrypted)
writeToFile(source.inputStream(), cachedFiles.file)
// Write to a tmp file first, so if we abort before done, we don't have a broken cached file
val tmpFile = File(cachedFiles.file.parentFile, "${cachedFiles.file.name}.tmp")
if (tmpFile.exists()) {
Timber.v("## FileService: discard aborted tmp file ${tmpFile.path}")
}
writeToFile(source.inputStream(), tmpFile)
response.close()
tmpFile.renameTo(cachedFiles.file)
} else {
Timber.v("## FileService: cache hit for $url")
}
@ -145,8 +151,13 @@ internal class DefaultFileService @Inject constructor(
Timber.v("## FileService: decrypt file")
// Ensure the parent folder exists
cachedFiles.decryptedFile.parentFile?.mkdirs()
// Write to a tmp file first, so if we abort before done, we don't have a broken cached file
val tmpFile = File(cachedFiles.decryptedFile.parentFile, "${cachedFiles.decryptedFile.name}.tmp")
if (tmpFile.exists()) {
Timber.v("## FileService: discard aborted tmp file ${tmpFile.path}")
}
val decryptSuccess = cachedFiles.file.inputStream().use { inputStream ->
cachedFiles.decryptedFile.outputStream().buffered().use { outputStream ->
tmpFile.outputStream().buffered().use { outputStream ->
MXEncryptedAttachments.decryptAttachment(
inputStream,
elementToDecrypt,
@ -154,6 +165,7 @@ internal class DefaultFileService @Inject constructor(
)
}
}
tmpFile.renameTo(cachedFiles.decryptedFile)
if (!decryptSuccess) {
throw IllegalStateException("Decryption error")
}