Media : extract an extension method to mediaupload

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/textcomposer/MessageComposerPresenter.kt

@@ -43,7 +43,7 @@ import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.mediapickers.api.PickerProvider
 import io.element.android.libraries.mediaupload.api.MediaPreProcessor
 import io.element.android.libraries.mediaupload.api.MediaType
-import io.element.android.libraries.mediaupload.api.MediaUploadInfo
+import io.element.android.libraries.mediaupload.api.sendMedia
 import io.element.android.libraries.textcomposer.MessageComposerMode
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.CoroutineScope
@@ -191,39 +191,21 @@ class MessageComposerPresenter @Inject constructor(
         mediaType: MediaType,
         deleteOriginal: Boolean = false
     ) = launch {
-        runCatching {
+        mediaPreProcessor.process(uri, mediaType, deleteOriginal)
-            val info = handleMediaPreProcessing(uri, mediaType, deleteOriginal).getOrNull() ?: return@runCatching
+            .map { info ->
-            when (info) {
+                room.sendMedia(info)
-                is MediaUploadInfo.Image -> {
+            }
-                    room.sendImage(info.file, info.thumbnailInfo.file, info.info)
+            .onSuccess {
+                Timber.d("onSuccess sending media")
+            }.onFailure { failure ->
+                Timber.e(failure, "onfailure sending media: $failure")
+                val snackbarMessage = if (failure is MediaPreProcessor.Failure) {
+                    StringR.string.screen_media_upload_preview_error_failed_processing
+                } else {
+                    StringR.string.screen_media_upload_preview_error_failed_sending
                 }
+                snackbarDispatcher.post(SnackbarMessage(snackbarMessage))
+            }
 
-                is MediaUploadInfo.Video -> {
-                    room.sendVideo(info.file, info.thumbnailInfo.file, info.info)
-                }
-
-                is MediaUploadInfo.AnyFile -> {
-                    room.sendFile(info.file, info.info)
-                }
-                else -> error("Unexpected MediaUploadInfo format: $info")
-            }.getOrThrow()
-        }.onFailure {
-            snackbarDispatcher.post(SnackbarMessage(StringR.string.screen_media_upload_preview_error_failed_sending))
-            Timber.e(it, "Couldn't upload media")
-        }.onSuccess {
-            Timber.d("Media uploaded")
-        }
-    }
-
-    private suspend fun handleMediaPreProcessing(
-        uri: Uri,
-        mediaType: MediaType,
-        deleteOriginal: Boolean,
-    ): Result<MediaUploadInfo> {
-        val result = mediaPreProcessor.process(uri, mediaType, deleteOriginal = deleteOriginal)
-        Timber.d("Pre-processed media result: $result")
-        return result.onFailure {
-            snackbarDispatcher.post(SnackbarMessage(StringR.string.screen_media_upload_preview_error_failed_processing))
-        }
     }
 }

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

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

libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/RoomExt.kt

@@ -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")
+    }
+}
+

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

@@ -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 ->