Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 9 Projects Releases Packages Wiki Activity Actions

Media: fix encrypted media

Browse source
This commit is contained in:
ganfra 2023-05-16 11:51:11 +02:00
parent 801e99a4db
commit ac1531390e
20 changed files with 73 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/MediaPreProcessorImpl.kt
View file

@ -33,7 +33,7 @@ import io.element.android.libraries.di.ApplicationContext
import io.element.android.libraries.matrix.api.media.AudioInfo
import io.element.android.libraries.matrix.api.media.FileInfo
import io.element.android.libraries.matrix.api.media.ImageInfo
import io.element.android.libraries.matrix.api.media.MatrixMediaSource
import io.element.android.libraries.matrix.api.media.MediaSource
import io.element.android.libraries.matrix.api.media.ThumbnailInfo
import io.element.android.libraries.matrix.api.media.VideoInfo
import io.element.android.libraries.mediaupload.api.MediaPreProcessor
@ -217,7 +217,7 @@ class MediaPreProcessorImpl @Inject constructor(
mimetype = mimeType,
size = file.length(),
thumbnailInfo = thumbnailInfo?.info,
thumbnailSource = thumbnailUrl?.let { MatrixMediaSource(it) },
thumbnailSource = thumbnailUrl?.let { MediaSource(it) },
blurhash = thumbnailInfo?.blurhash,
)
}
@ -251,7 +251,7 @@ fun ImageCompressionResult.toImageInfo(mimeType: String, thumbnailUrl: String?,
mimetype = mimeType,
size = size,
thumbnailInfo = thumbnailInfo,
thumbnailSource = thumbnailUrl?.let { MatrixMediaSource(it) },
thumbnailSource = thumbnailUrl?.let { MediaSource(it) },
blurhash = blurhash,
)

3
libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaPreProcessor.kt
View file

@ -32,10 +32,11 @@ class FakeMediaPreProcessor : MediaPreProcessor {
mimetype = "*/*",
size = 999L,
thumbnailInfo = null,
thumbnailUrl = null,
thumbnailSource = null,
)
)
)
override suspend fun process(uri: Uri, mediaType: MediaType, deleteOriginal: Boolean): Result<MediaUploadInfo> = result
fun givenResult(value: Result<MediaUploadInfo>) {