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

Ensure temporary files are deleted even in case of Exception

This commit is contained in:
Benoit Marty 2020-09-04 12:03:20 +02:00
parent 0217e79324
commit 3a659a9f3b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
View File

@ -111,6 +111,8 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
.also { Timber.e("## Send: Work cancelled by user") }
}
val filesToDelete = mutableListOf<File>()
try {
val inputStream = context.contentResolver.openInputStream(attachment.queryUri)
?: return Result.success(
@ -123,6 +125,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
// always use a temporary file, it guaranties that we could report progress on upload and simplifies the flows
val workingFile = File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
.also { filesToDelete.add(it) }
workingFile.outputStream().use { outputStream ->
inputStream.use { inputStream ->
inputStream.copyTo(outputStream)
@ -194,9 +197,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
)
}
}
// we can delete workingFile
tryThis { workingFile.delete() }
.also { filesToDelete.add(it) }
} else {
fileToUpload = workingFile
}
@ -205,6 +206,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
Timber.v("## FileService: Encrypt file")
val tmpEncrypted = File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
.also { filesToDelete.add(it) }
uploadedFileEncryptedFileInfo =
MXEncryptedAttachments.encrypt(fileToUpload.inputStream(), attachment.getSafeMimeType(), tmpEncrypted) { read, total ->
@ -217,10 +219,6 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
fileUploader
.uploadFile(tmpEncrypted, attachment.name, "application/octet-stream", progressListener)
.also {
// we can delete?
tryThis { tmpEncrypted.delete() }
}
} else {
Timber.v("## FileService: Clear file")
fileUploader
@ -257,6 +255,11 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
)
)
)
} finally {
// Delete all temporary files
filesToDelete.forEach {
tryThis { it.delete() }
}
}
}