From c13ab621874bed52e41f6510286044c4e60296e7 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 8 Jul 2019 15:37:39 +0200 Subject: [PATCH] Fix issue when sending video in encrypted room --- .../android/internal/session/content/UploadContentWorker.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/UploadContentWorker.kt index 0a2aca99..8e1a0281 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/UploadContentWorker.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/UploadContentWorker.kt @@ -202,9 +202,10 @@ internal class UploadContentWorker(context: Context, params: WorkerParameters) : thumbnailEncryptedFileInfo: EncryptedFileInfo?): MessageVideoContent { return copy( url = if (encryptedFileInfo == null) url else null, + encryptedFileInfo = encryptedFileInfo?.copy(url = url), videoInfo = videoInfo?.copy( thumbnailUrl = if (thumbnailEncryptedFileInfo == null) thumbnailUrl else null, - thumbnailFile = thumbnailEncryptedFileInfo?.copy(url = url) + thumbnailFile = thumbnailEncryptedFileInfo?.copy(url = thumbnailUrl) ) ) }