From 1ae58aa6add6dbee2f4f566a8c4b585a8965666b Mon Sep 17 00:00:00 2001 From: David Hyman Date: Fri, 10 Jan 2020 14:53:30 -0500 Subject: [PATCH] DefaultFileService - code was passing the inputStream to the decryption method but not storing the output of the method anywhere then it was writing inputStream to file and returning that file handle changed inputStream to var and used it to store output of decryption method --- .../matrix/android/internal/session/DefaultFileService.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultFileService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultFileService.kt index 66b94cf68d..0160e88b8c 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultFileService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultFileService.kt @@ -74,7 +74,7 @@ internal class DefaultFileService @Inject constructor(private val context: Conte .build() val response = okHttpClient.newCall(request).execute() - val inputStream = response.body?.byteStream() + var inputStream = response.body?.byteStream() Timber.v("Response size ${response.body?.contentLength()} - Stream available: ${inputStream?.available()}") if (!response.isSuccessful || inputStream == null) { @@ -83,7 +83,7 @@ internal class DefaultFileService @Inject constructor(private val context: Conte if (elementToDecrypt != null) { Timber.v("## decrypt file") - MXEncryptedAttachments.decryptAttachment(inputStream, elementToDecrypt) + inputStream = MXEncryptedAttachments.decryptAttachment(inputStream, elementToDecrypt) ?: throw IllegalStateException("Decryption error") }