6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Fix bug

Browse Source
This commit is contained in:
Benoit Marty
2019-07-09 11:05:25 +02:00
parent d7b2371854
commit 058e7153a1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,11 +62,9 @@ internal class DefaultFileService @Inject constructor(private val context: Conte
val folder = getFolder(downloadMode, id)
File(folder, fileName)
}.map { destFile ->
if (!destFile.exists()) {
}.flatMap { destFile ->
if (!destFile.exists() || downloadMode == FileService.DownloadMode.TO_EXPORT) {
Try {
Timber.v("## decrypt file")
val resolvedUrl = contentUrlResolver.resolveFullSize(url) ?: throw IllegalArgumentException("url is null")
val request = Request.Builder()
@ -82,6 +80,7 @@ internal class DefaultFileService @Inject constructor(private val context: Conte
}
if (elementToDecrypt != null) {
Timber.v("## decrypt file")
MXEncryptedAttachments.decryptAttachment(inputStream, elementToDecrypt) ?: throw IllegalStateException("Decryption error")
} else {
inputStream
@ -89,10 +88,11 @@ internal class DefaultFileService @Inject constructor(private val context: Conte
}
.map { inputStream ->
writeToFile(inputStream, destFile)
destFile
}
} else {
Try.just(destFile)
}
destFile
}
}
.foldToCallback(callback)