mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-28 00:39:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request from david1hyman/file-decryption-fix

Browse source 
File decryption path was writing incorrect stream to file
This commit is contained in:
Benoit Marty 2020-01-16 10:50:15 +01:00 • committed by GitHub
commit 4ae09b8716
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

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

@ -74,7 +74,7 @@ internal class DefaultFileService @Inject constructor(private val context: Conte
.build() .build()
val response = okHttpClient.newCall(request).execute() 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()}") Timber.v("Response size ${response.body?.contentLength()} - Stream available: ${inputStream?.available()}")
if (!response.isSuccessful if (!response.isSuccessful
|| inputStream == null) { || inputStream == null) {
@ -83,7 +83,7 @@ internal class DefaultFileService @Inject constructor(private val context: Conte
if (elementToDecrypt != null) { if (elementToDecrypt != null) {
Timber.v("## decrypt file") Timber.v("## decrypt file")
MXEncryptedAttachments.decryptAttachment(inputStream, elementToDecrypt) inputStream = MXEncryptedAttachments.decryptAttachment(inputStream, elementToDecrypt)
?: throw IllegalStateException("Decryption error") ?: throw IllegalStateException("Decryption error")
} }