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

Media : extract an extension method to mediaupload

Browse source
This commit is contained in:
ganfra 2023-05-16 11:24:14 +02:00
parent 4b49d40801
commit e3ad4ee06f
4 changed files with 62 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaPreProcessor.kt
View file

@ -29,4 +29,7 @@ interface MediaPreProcessor {
mediaType: MediaType,
deleteOriginal: Boolean = false
): Result<MediaUploadInfo>
data class Failure(override val cause: Throwable?) : RuntimeException(cause)
}

39
libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/RoomExt.kt Normal file
View file

@ -0,0 +1,39 @@
/*
* Copyright (c) 2023 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.element.android.libraries.mediaupload.api
import io.element.android.libraries.matrix.api.room.MatrixRoom
suspend fun MatrixRoom.sendMedia(
info: MediaUploadInfo,
): Result<Unit> {
return when (info) {
is MediaUploadInfo.Image -> {
sendImage(info.file, info.thumbnailInfo.file, info.info)
}
is MediaUploadInfo.Video -> {
sendVideo(info.file, info.thumbnailInfo.file, info.info)
}
is MediaUploadInfo.AnyFile -> {
sendFile(info.file, info.info)
}
else -> error("Unexpected MediaUploadInfo format: $info")
}
}

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

@ -25,6 +25,7 @@ import com.squareup.anvil.annotations.ContributesBinding
import io.element.android.libraries.androidutils.file.createTmpFile
import io.element.android.libraries.androidutils.media.runAndRelease
import io.element.android.libraries.core.data.tryOrNull
import io.element.android.libraries.core.extensions.mapFailure
import io.element.android.libraries.core.mimetype.MimeTypes
import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeImage
import io.element.android.libraries.di.AppScope
@ -71,6 +72,7 @@ class MediaPreProcessorImpl @Inject constructor(
* See [the Matrix spec](https://spec.matrix.org/latest/client-server-api/?ref=blog.gitter.im#thumbnails).
*/
private const val THUMB_MAX_WIDTH = 800
/**
* Max height of thumbnail images.
* See [the Matrix spec](https://spec.matrix.org/latest/client-server-api/?ref=blog.gitter.im#thumbnails).
@ -93,7 +95,7 @@ class MediaPreProcessorImpl @Inject constructor(
// Camera returns an 'octet-stream' mimetype, so it needs to be overridden
val mimeType = contentResolver.getType(uri)
val mimeTypeOrDefault = if (mimeType == MimeTypes.OctetStream) {
when(mediaType) {
when (mediaType) {
MediaType.Image -> MimeTypes.Jpeg
MediaType.Video -> MimeTypes.Mp4
MediaType.Audio -> MimeTypes.Ogg
@ -104,7 +106,7 @@ class MediaPreProcessorImpl @Inject constructor(
}
val compressBeforeSending = mediaType in sequenceOf(MediaType.Image, MediaType.Video)
val result = if (compressBeforeSending && mimeType != MimeTypes.Gif) {
when(mediaType) {
when (mediaType) {
MediaType.Image -> processImage(uri)
MediaType.Video -> processVideo(uri, mimeTypeOrDefault)
MediaType.Audio -> processAudio(uri, mimeTypeOrDefault)
@ -124,13 +126,11 @@ class MediaPreProcessorImpl @Inject constructor(
)
MediaUploadInfo.AnyFile(file, info)
}
if (deleteOriginal) {
contentResolver.delete(uri, null, null)
}
result
}
}.mapFailure { MediaPreProcessor.Failure(it) }
private suspend fun processImage(uri: Uri): MediaUploadInfo {
val compressedFileResult = contentResolver.openInputStream(uri).use { input ->