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

Rename var

This commit is contained in:
Benoit Marty 2021-07-19 16:32:02 +02:00
parent 7643cc506d
commit a2996ee042
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,8 +97,8 @@ internal class DefaultFileService @Inject constructor(
} }
} }
var atomicFileCreator1: AtomicFileCreator? = null var atomicFileDownload: AtomicFileCreator? = null
var atomicFileCreator2: AtomicFileCreator? = null var atomicFileDecrypt: AtomicFileCreator? = null
if (existingDownload != null) { if (existingDownload != null) {
// FIXME If the first downloader cancels then we'll unfortunately be cancelled too. // FIXME If the first downloader cancels then we'll unfortunately be cancelled too.
@ -136,7 +136,7 @@ internal class DefaultFileService @Inject constructor(
// Write the file to cache (encrypted version if the file is encrypted) // Write the file to cache (encrypted version if the file is encrypted)
// Write to a part file first, so if we abort before done, we don't have a broken cached file // Write to a part file first, so if we abort before done, we don't have a broken cached file
val atomicFileCreator = AtomicFileCreator(cachedFiles.file).also { atomicFileCreator1 = it } val atomicFileCreator = AtomicFileCreator(cachedFiles.file).also { atomicFileDownload = it }
writeToFile(source.inputStream(), atomicFileCreator.partFile) writeToFile(source.inputStream(), atomicFileCreator.partFile)
response.close() response.close()
atomicFileCreator.commit() atomicFileCreator.commit()
@ -153,7 +153,7 @@ internal class DefaultFileService @Inject constructor(
// Ensure the parent folder exists // Ensure the parent folder exists
cachedFiles.decryptedFile.parentFile?.mkdirs() cachedFiles.decryptedFile.parentFile?.mkdirs()
// Write to a part file first, so if we abort before done, we don't have a broken cached file // Write to a part file first, so if we abort before done, we don't have a broken cached file
val atomicFileCreator = AtomicFileCreator(cachedFiles.decryptedFile).also { atomicFileCreator2 = it } val atomicFileCreator = AtomicFileCreator(cachedFiles.decryptedFile).also { atomicFileDecrypt = it }
val decryptSuccess = cachedFiles.file.inputStream().use { inputStream -> val decryptSuccess = cachedFiles.file.inputStream().use { inputStream ->
atomicFileCreator.partFile.outputStream().buffered().use { outputStream -> atomicFileCreator.partFile.outputStream().buffered().use { outputStream ->
MXEncryptedAttachments.decryptAttachment( MXEncryptedAttachments.decryptAttachment(
@ -185,8 +185,8 @@ internal class DefaultFileService @Inject constructor(
toNotify?.completeWith(result) toNotify?.completeWith(result)
result.onFailure { result.onFailure {
atomicFileCreator1?.cancel() atomicFileDownload?.cancel()
atomicFileCreator2?.cancel() atomicFileDecrypt?.cancel()
} }
return result.getOrThrow() return result.getOrThrow()