Media : some improvements and cleaning

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

@@ -27,9 +27,9 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import io.element.android.features.messages.impl.actionlist.ActionListPresenter
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
-import io.element.android.features.messages.impl.textcomposer.MessageComposerEvents
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents
-import io.element.android.features.messages.impl.textcomposer.MessageComposerPresenter
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenter
-import io.element.android.features.messages.impl.textcomposer.MessageComposerState
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerState
 import io.element.android.features.messages.impl.timeline.TimelineEvents
 import io.element.android.features.messages.impl.timeline.TimelinePresenter
 import io.element.android.features.messages.impl.timeline.model.TimelineItem

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

@@ -18,7 +18,7 @@ package io.element.android.features.messages.impl
 
 import androidx.compose.runtime.Immutable
 import io.element.android.features.messages.impl.actionlist.ActionListState
-import io.element.android.features.messages.impl.textcomposer.MessageComposerState
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerState
 import io.element.android.features.messages.impl.timeline.TimelineState
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.utils.SnackbarMessage

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

@@ -18,8 +18,8 @@ package io.element.android.features.messages.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.messages.impl.actionlist.anActionListState
-import io.element.android.features.messages.impl.textcomposer.AttachmentSourcePicker
+import io.element.android.features.messages.impl.messagecomposer.AttachmentSourcePicker
-import io.element.android.features.messages.impl.textcomposer.aMessageComposerState
+import io.element.android.features.messages.impl.messagecomposer.aMessageComposerState
 import io.element.android.features.messages.impl.timeline.aTimelineItemContent
 import io.element.android.features.messages.impl.timeline.aTimelineItemList
 import io.element.android.features.messages.impl.timeline.aTimelineState

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

@@ -64,10 +64,10 @@ import io.element.android.features.messages.impl.actionlist.ActionListEvents
 import io.element.android.features.messages.impl.actionlist.ActionListView
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.impl.attachments.Attachment
-import io.element.android.features.messages.impl.textcomposer.AttachmentSourcePicker
+import io.element.android.features.messages.impl.messagecomposer.AttachmentSourcePicker
-import io.element.android.features.messages.impl.textcomposer.AttachmentsState
+import io.element.android.features.messages.impl.messagecomposer.AttachmentsState
-import io.element.android.features.messages.impl.textcomposer.MessageComposerEvents
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents
-import io.element.android.features.messages.impl.textcomposer.MessageComposerView
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerView
 import io.element.android.features.messages.impl.timeline.TimelineView
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.networkmonitor.api.ui.ConnectivityIndicatorView

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt

@@ -29,19 +29,13 @@ import io.element.android.features.messages.impl.attachments.Attachment
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.executeResult
-import io.element.android.libraries.core.extensions.flatMap
+import io.element.android.libraries.mediaupload.api.MediaSender
-import io.element.android.libraries.designsystem.utils.SnackbarDispatcher
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.mediaupload.api.MediaPreProcessor
-import io.element.android.libraries.mediaupload.api.sendMedia
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
 class AttachmentsPreviewPresenter @AssistedInject constructor(
     @Assisted private val attachment: Attachment,
-    private val room: MatrixRoom,
+    private val mediaSender: MediaSender,
-    private val mediaPreProcessor: MediaPreProcessor,
-    private val snackbarDispatcher: SnackbarDispatcher,
 ) : Presenter<AttachmentsPreviewState> {
 
     @AssistedFactory
@@ -81,7 +75,6 @@ class AttachmentsPreviewPresenter @AssistedInject constructor(
                 sendMedia(
                     uri = attachment.localMedia.uri,
                     mimeType = attachment.localMedia.mimeType,
-                    deleteOriginal = false,
                     sendActionState = sendActionState
                 )
             }
@@ -91,15 +84,10 @@ class AttachmentsPreviewPresenter @AssistedInject constructor(
     private suspend fun sendMedia(
         uri: Uri,
         mimeType: String,
-        deleteOriginal: Boolean = false,
         sendActionState: MutableState<Async<Unit>>,
     ) {
         suspend {
-            mediaPreProcessor
+            mediaSender.sendMedia(uri, mimeType)
-                .process(uri, mimeType, deleteOriginal)
-                .flatMap { info ->
-                    room.sendMedia(info)
-                }
         }.executeResult(sendActionState)
     }
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/viewer/MediaViewerEvents.kt

@@ -18,5 +18,4 @@ package io.element.android.features.messages.impl.media.viewer
 
 sealed interface MediaViewerEvents {
     object RetryLoading : MediaViewerEvents
-    object SaveOnDisk : MediaViewerEvents
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/viewer/MediaViewerPresenter.kt

@@ -68,7 +68,6 @@ class MediaViewerPresenter @AssistedInject constructor(
         fun handleEvents(mediaViewerEvents: MediaViewerEvents) {
             when (mediaViewerEvents) {
                 MediaViewerEvents.RetryLoading -> loadMediaTrigger++
-                MediaViewerEvents.SaveOnDisk -> TODO()
             }
         }
 

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerEvents.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.impl.textcomposer
+package io.element.android.features.messages.impl.messagecomposer
 
 import androidx.compose.runtime.Immutable
 import io.element.android.libraries.textcomposer.MessageComposerMode

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.impl.textcomposer
+package io.element.android.features.messages.impl.messagecomposer
 
 import android.annotation.SuppressLint
 import android.net.Uri
@@ -33,14 +33,12 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.data.StableCharSequence
 import io.element.android.libraries.core.data.toStableCharSequence
 import io.element.android.libraries.core.mimetype.MimeTypes
-import io.element.android.libraries.designsystem.utils.SnackbarDispatcher
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 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.textcomposer.MessageComposerMode
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.CoroutineScope

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.impl.textcomposer
+package io.element.android.features.messages.impl.messagecomposer
 
 import androidx.compose.runtime.Immutable
 import io.element.android.features.messages.impl.attachments.Attachment

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.impl.textcomposer
+package io.element.android.features.messages.impl.messagecomposer
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.core.data.StableCharSequence

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.impl.textcomposer
+package io.element.android.features.messages.impl.messagecomposer
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/blurhash/BlurHashAsyncImage.kt

@@ -45,7 +45,7 @@ fun BlurHashAsyncImage(
         loading = {
             BlurHashImage(
                 blurHash = blurHash,
-                contentScale = contentScale,
+                contentScale = ContentScale.FillBounds,
                 contentDescription = "Loading placeholder"
             )
         },

features/messages/impl/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt

@@ -26,7 +26,7 @@ import io.element.android.features.messages.impl.MessagesEvents
 import io.element.android.features.messages.impl.MessagesPresenter
 import io.element.android.features.messages.impl.actionlist.ActionListPresenter
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
-import io.element.android.features.messages.impl.textcomposer.MessageComposerPresenter
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenter
 import io.element.android.features.messages.impl.timeline.TimelinePresenter
 import io.element.android.features.networkmonitor.test.FakeNetworkMonitor
 import io.element.android.libraries.designsystem.utils.SnackbarDispatcher

features/messages/impl/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt

@@ -23,10 +23,10 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.ReceiveTurbine
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.messages.impl.textcomposer.AttachmentSourcePicker
+import io.element.android.features.messages.impl.messagecomposer.AttachmentSourcePicker
-import io.element.android.features.messages.impl.textcomposer.MessageComposerEvents
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents
-import io.element.android.features.messages.impl.textcomposer.MessageComposerPresenter
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenter
-import io.element.android.features.messages.impl.textcomposer.MessageComposerState
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerState
 import io.element.android.libraries.core.data.StableCharSequence
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.designsystem.utils.SnackbarDispatcher

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt

@@ -209,28 +209,27 @@ class RustMatrixRoom(
         }
     }
 
-    override suspend fun sendImage(file: File, thumbnailFile: File, imageInfo: ImageInfo): Result<Unit> {
+    override suspend fun sendImage(file: File, thumbnailFile: File, imageInfo: ImageInfo): Result<Unit> = withContext(coroutineDispatchers.io) {
-        return runCatching {
+        runCatching {
             innerRoom.sendImage(file.path, thumbnailFile.path, imageInfo.map())
         }
     }
 
-    override suspend fun sendVideo(file: File, thumbnailFile: File, videoInfo: VideoInfo): Result<Unit> {
+    override suspend fun sendVideo(file: File, thumbnailFile: File, videoInfo: VideoInfo): Result<Unit> = withContext(coroutineDispatchers.io) {
-        return runCatching {
+        runCatching {
             innerRoom.sendVideo(file.path, thumbnailFile.path, videoInfo.map())
         }
     }
 
-    override suspend fun sendAudio(file: File, audioInfo: AudioInfo): Result<Unit> {
+    override suspend fun sendAudio(file: File, audioInfo: AudioInfo): Result<Unit> = withContext(coroutineDispatchers.io) {
-        return runCatching {
+        runCatching {
             innerRoom.sendAudio(file.path, audioInfo.map())
         }
     }
 
-    override suspend fun sendFile(file: File, fileInfo: FileInfo): Result<Unit> {
+    override suspend fun sendFile(file: File, fileInfo: FileInfo): Result<Unit> = withContext(coroutineDispatchers.io) {
-        return runCatching {
+        runCatching {
             innerRoom.sendFile(file.path, fileInfo.map())
         }
     }
-
 }

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

@@ -0,0 +1,55 @@
+/*
+ * 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 android.net.Uri
+import io.element.android.libraries.core.extensions.flatMap
+import io.element.android.libraries.matrix.api.room.MatrixRoom
+import javax.inject.Inject
+
+class MediaSender @Inject constructor(
+    private val preProcessor: MediaPreProcessor,
+    private val room: MatrixRoom,
+) {
+
+    suspend fun sendMedia(uri: Uri, mimeType: String): Result<Unit> {
+        return preProcessor
+            .process(uri, mimeType, deleteOriginal = true)
+            .flatMap { info ->
+                room.sendMedia(info)
+            }
+    }
+
+    private 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/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/RoomExt.kt

@@ -1,39 +0,0 @@
-/*
- * 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/AndroidMediaPreProcessor.kt

@@ -119,7 +119,9 @@ class AndroidMediaPreProcessor @Inject constructor(
             MediaUploadInfo.AnyFile(file, info)
         }
         if (deleteOriginal) {
-            contentResolver.delete(uri, null, null)
+            tryOrNull {
+                contentResolver.delete(uri, null, null)
+            }
         }
         result
     }.mapFailure { MediaPreProcessor.Failure(it) }