Fix SDK integration

2024-03-20 09:36:35 +01:00
parent ef130874fb
commit f2d240c66d
5 changed files with 84 additions and 9 deletions
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
@@ -463,7 +463,12 @@ class MessageComposerPresenter @Inject constructor(
                }
            }
        }
-        mediaSender.sendMedia(uri, mimeType, compressIfPossible = false, progressCallback).getOrThrow()
+        mediaSender.sendMedia(
+            uri = uri,
+            mimeType = mimeType,
+            compressIfPossible = false,
+            progressCallback = progressCallback
+        ).getOrThrow()
    }
        .onSuccess {
            attachmentState.value = AttachmentsState.None
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
@@ -127,9 +127,23 @@ interface MatrixRoom : Closeable {

    suspend fun redactEvent(eventId: EventId, reason: String? = null): Result<Unit>

-    suspend fun sendImage(file: File, thumbnailFile: File?, imageInfo: ImageInfo, progressCallback: ProgressCallback?): Result<MediaUploadHandler>
+    suspend fun sendImage(
+        file: File,
+        thumbnailFile: File?,
+        imageInfo: ImageInfo,
+        body: String?,
+        formattedBody: String?,
+        progressCallback: ProgressCallback?
+    ): Result<MediaUploadHandler>

-    suspend fun sendVideo(file: File, thumbnailFile: File?, videoInfo: VideoInfo, progressCallback: ProgressCallback?): Result<MediaUploadHandler>
+    suspend fun sendVideo(
+        file: File,
+        thumbnailFile: File?,
+        videoInfo: VideoInfo,
+        body: String?,
+        formattedBody: String?,
+        progressCallback: ProgressCallback?
+    ): Result<MediaUploadHandler>

    suspend fun sendAudio(file: File, audioInfo: AudioInfo, progressCallback: ProgressCallback?): Result<MediaUploadHandler>

--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
@@ -75,6 +75,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.EventTimelineItem
+import org.matrix.rustcomponents.sdk.MessageFormat
 import org.matrix.rustcomponents.sdk.RoomInfo
 import org.matrix.rustcomponents.sdk.RoomInfoListener
 import org.matrix.rustcomponents.sdk.RoomListItem
@@ -90,6 +91,7 @@ import org.matrix.rustcomponents.sdk.use
 import timber.log.Timber
 import uniffi.matrix_sdk.RoomPowerLevelChanges
 import java.io.File
+import org.matrix.rustcomponents.sdk.FormattedBody as RustFormattedBody
 import org.matrix.rustcomponents.sdk.Room as InnerRoom
 import org.matrix.rustcomponents.sdk.Timeline as InnerTimeline

@@ -436,10 +438,21 @@ class RustMatrixRoom(
        file: File,
        thumbnailFile: File?,
        imageInfo: ImageInfo,
+        body: String?,
+        formattedBody: String?,
        progressCallback: ProgressCallback?,
    ): Result<MediaUploadHandler> {
        return sendAttachment(listOfNotNull(file, thumbnailFile)) {
-            innerTimeline.sendImage(file.path, thumbnailFile?.path, imageInfo.map(), progressCallback?.toProgressWatcher())
+            innerTimeline.sendImage(
+                url = file.path,
+                thumbnailUrl = thumbnailFile?.path,
+                imageInfo = imageInfo.map(),
+                caption = body,
+                formattedCaption = formattedBody?.let {
+                    RustFormattedBody(body = it, format = MessageFormat.Html)
+                },
+                progressWatcher = progressCallback?.toProgressWatcher()
+            )
        }
    }

@@ -447,16 +460,34 @@ class RustMatrixRoom(
        file: File,
        thumbnailFile: File?,
        videoInfo: VideoInfo,
+        body: String?,
+        formattedBody: String?,
        progressCallback: ProgressCallback?,
    ): Result<MediaUploadHandler> {
        return sendAttachment(listOfNotNull(file, thumbnailFile)) {
-            innerTimeline.sendVideo(file.path, thumbnailFile?.path, videoInfo.map(), progressCallback?.toProgressWatcher())
+            innerTimeline.sendVideo(
+                url = file.path,
+                thumbnailUrl = thumbnailFile?.path,
+                videoInfo = videoInfo.map(),
+                caption = body,
+                formattedCaption = formattedBody?.let {
+                    RustFormattedBody(body = it, format = MessageFormat.Html)
+                },
+                progressWatcher = progressCallback?.toProgressWatcher()
+            )
        }
    }

    override suspend fun sendAudio(file: File, audioInfo: AudioInfo, progressCallback: ProgressCallback?): Result<MediaUploadHandler> {
        return sendAttachment(listOf(file)) {
-            innerTimeline.sendAudio(file.path, audioInfo.map(), progressCallback?.toProgressWatcher())
+            innerTimeline.sendAudio(
+                url = file.path,
+                audioInfo = audioInfo.map(),
+                // Maybe allow a caption in the future?
+                caption = null,
+                formattedCaption = null,
+                progressWatcher = progressCallback?.toProgressWatcher()
+            )
        }
    }

@@ -653,6 +684,9 @@ class RustMatrixRoom(
            url = file.path,
            audioInfo = audioInfo.map(),
            waveform = waveform.toMSC3246range(),
+            // Maybe allow a caption in the future?
+            caption = null,
+            formattedCaption = null,
            progressWatcher = progressCallback?.toProgressWatcher(),
        )
    }
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
@@ -357,6 +357,8 @@ class FakeMatrixRoom(
        file: File,
        thumbnailFile: File?,
        imageInfo: ImageInfo,
+        body: String?,
+        formattedBody: String?,
        progressCallback: ProgressCallback?
    ): Result<MediaUploadHandler> = fakeSendMedia(progressCallback)

@@ -364,6 +366,8 @@ class FakeMatrixRoom(
        file: File,
        thumbnailFile: File?,
        videoInfo: VideoInfo,
+        body: String?,
+        formattedBody: String?,
        progressCallback: ProgressCallback?
    ): Result<MediaUploadHandler> = fakeSendMedia(
        progressCallback
--- a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt
+++ b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt
@@ -37,6 +37,8 @@ class MediaSender @Inject constructor(
        uri: Uri,
        mimeType: String,
        compressIfPossible: Boolean,
+        caption: String? = null,
+        formattedCaption: String? = null,
        progressCallback: ProgressCallback? = null
    ): Result<Unit> {
        return preProcessor
@@ -44,10 +46,15 @@ class MediaSender @Inject constructor(
                uri = uri,
                mimeType = mimeType,
                deleteOriginal = true,
-                compressIfPossible = compressIfPossible
+                compressIfPossible = compressIfPossible,
            )
            .flatMapCatching { info ->
-                room.sendMedia(info, progressCallback)
+                room.sendMedia(
+                    uploadInfo = info,
+                    progressCallback = progressCallback,
+                    caption = caption,
+                    formattedCaption = formattedCaption
+                )
            }
            .handleSendResult()
    }
@@ -71,7 +78,12 @@ class MediaSender @Inject constructor(
                    audioInfo = audioInfo,
                    waveform = waveForm,
                )
-                room.sendMedia(newInfo, progressCallback)
+                room.sendMedia(
+                    uploadInfo = newInfo,
+                    progressCallback = progressCallback,
+                    caption = null,
+                    formattedCaption = null
+                )
            }
            .handleSendResult()
    }
@@ -90,6 +102,8 @@ class MediaSender @Inject constructor(
    private suspend fun MatrixRoom.sendMedia(
        uploadInfo: MediaUploadInfo,
        progressCallback: ProgressCallback?,
+        caption: String?,
+        formattedCaption: String?,
    ): Result<Unit> {
        val handler = when (uploadInfo) {
            is MediaUploadInfo.Image -> {
@@ -97,6 +111,8 @@ class MediaSender @Inject constructor(
                    file = uploadInfo.file,
                    thumbnailFile = uploadInfo.thumbnailFile,
                    imageInfo = uploadInfo.imageInfo,
+                    body = caption,
+                    formattedBody = formattedCaption,
                    progressCallback = progressCallback
                )
            }
@@ -105,6 +121,8 @@ class MediaSender @Inject constructor(
                    file = uploadInfo.file,
                    thumbnailFile = uploadInfo.thumbnailFile,
                    videoInfo = uploadInfo.videoInfo,
+                    body = caption,
+                    formattedBody = formattedCaption,
                    progressCallback = progressCallback
                )
            }