Media: upload audio

ganfra · ganfra · commit e9a34eb46d12 · 2023-07-13T20:34:07.000+02:00
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/MediaInfo.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/MediaInfo.kt
@@ -29,7 +29,7 @@ data class MediaInfo(
 ) : Parcelable
 
 fun anImageInfo(): MediaInfo = MediaInfo(
-    "an image file.jpg", MimeTypes.Jpeg, "4MB","jpg"
+    "an image file.jpg", MimeTypes.Jpeg, "4MB", "jpg"
 )
 
 fun aVideoInfo(): MediaInfo = MediaInfo(
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt
@@ -324,7 +324,7 @@ class MessageComposerPresenterTest {
             Result.success(
                 MediaUploadInfo.Image(
                     file = File("/some/path"),
-                    info = ImageInfo(
+                    imageInfo = ImageInfo(
                         width = null,
                         height = null,
                         mimetype = null,
@@ -357,7 +357,7 @@ class MessageComposerPresenterTest {
             Result.success(
                 MediaUploadInfo.Video(
                     file = File("/some/path"),
-                    info = VideoInfo(
+                    videoInfo = VideoInfo(
                         width = null,
                         height = null,
                         mimetype = null,
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditPresenterTest.kt
@@ -605,7 +605,7 @@ class RoomDetailsEditPresenterTest {
             Result.success(
                 MediaUploadInfo.AnyFile(
                     file = processedFile,
-                    info = mockk(),
+                    fileInfo = mockk(),
                 )
             )
         )
diff --git 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
@@ -46,36 +46,43 @@ class MediaSender @Inject constructor(
     }
 
     private suspend fun MatrixRoom.sendMedia(
-        info: MediaUploadInfo,
+        uploadInfo: MediaUploadInfo,
         progressCallback: ProgressCallback?
     ): Result<Unit> {
-        return when (info) {
+        return when (uploadInfo) {
             is MediaUploadInfo.Image -> {
                 sendImage(
-                    file = info.file,
-                    thumbnailFile = info.thumbnailFile,
-                    imageInfo = info.info,
+                    file = uploadInfo.file,
+                    thumbnailFile = uploadInfo.thumbnailFile,
+                    imageInfo = uploadInfo.imageInfo,
                     progressCallback = progressCallback
                 )
             }
 
             is MediaUploadInfo.Video -> {
                 sendVideo(
-                    file = info.file,
-                    thumbnailFile = info.thumbnailFile,
-                    videoInfo = info.info,
+                    file = uploadInfo.file,
+                    thumbnailFile = uploadInfo.thumbnailFile,
+                    videoInfo = uploadInfo.videoInfo,
+                    progressCallback = progressCallback
+                )
+            }
+            is MediaUploadInfo.Audio -> {
+                sendAudio(
+                    file = uploadInfo.file,
+                    audioInfo = uploadInfo.audioInfo,
                     progressCallback = progressCallback
                 )
             }
 
             is MediaUploadInfo.AnyFile -> {
                 sendFile(
-                    file = info.file,
-                    fileInfo = info.info,
+                    file = uploadInfo.file,
+                    fileInfo = uploadInfo.fileInfo,
                     progressCallback = progressCallback
                 )
             }
-            else -> Result.failure(IllegalStateException("Unexpected MediaUploadInfo format: $info"))
+            else -> Result.failure(IllegalStateException("Unexpected MediaUploadInfo format: $uploadInfo"))
         }
     }
 }
diff --git a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaUploadInfo.kt b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaUploadInfo.kt
@@ -26,8 +26,8 @@ sealed interface MediaUploadInfo {
 
     val file: File
 
-    data class Image(override val file: File, val info: ImageInfo, val thumbnailFile: File) : MediaUploadInfo
-    data class Video(override val file: File, val info: VideoInfo, val thumbnailFile: File) : MediaUploadInfo
-    data class Audio(override val file: File, val info: AudioInfo) : MediaUploadInfo
-    data class AnyFile(override val file: File, val info: FileInfo) : MediaUploadInfo
+    data class Image(override val file: File, val imageInfo: ImageInfo, val thumbnailFile: File) : MediaUploadInfo
+    data class Video(override val file: File, val videoInfo: VideoInfo, val thumbnailFile: File) : MediaUploadInfo
+    data class Audio(override val file: File, val audioInfo: AudioInfo) : MediaUploadInfo
+    data class AnyFile(override val file: File, val fileInfo: FileInfo) : MediaUploadInfo
 }
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/AndroidMediaPreProcessor.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/AndroidMediaPreProcessor.kt
@@ -133,7 +133,7 @@ class AndroidMediaPreProcessor @Inject constructor(
             removeSensitiveImageMetadata(compressionResult.file)
             return MediaUploadInfo.Image(
                 file = compressionResult.file,
-                info = imageInfo,
+                imageInfo = imageInfo,
                 thumbnailFile = thumbnailResult.file
             )
         }
@@ -156,7 +156,7 @@ class AndroidMediaPreProcessor @Inject constructor(
             removeSensitiveImageMetadata(file)
             return MediaUploadInfo.Image(
                 file = file,
-                info = imageInfo,
+                imageInfo = imageInfo,
                 thumbnailFile = thumbnailResult.file
             )
         }
@@ -184,7 +184,7 @@ class AndroidMediaPreProcessor @Inject constructor(
         val videoInfo = extractVideoMetadata(resultFile, mimeType, thumbnailInfo)
         return MediaUploadInfo.Video(
             file = resultFile,
-            info = videoInfo,
+            videoInfo = videoInfo,
             thumbnailFile = thumbnailInfo.file
         )
     }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ data class MediaInfo(`
`29`	`29`	`) : Parcelable`
`30`	`30`
`31`	`31`	`fun anImageInfo(): MediaInfo = MediaInfo(`
`32`		`- "an image file.jpg", MimeTypes.Jpeg, "4MB","jpg"`
	`32`	`+ "an image file.jpg", MimeTypes.Jpeg, "4MB", "jpg"`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`fun aVideoInfo(): MediaInfo = MediaInfo(`
Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,7 @@ class RoomDetailsEditPresenterTest {`
`605`	`605`	`Result.success(`
`606`	`606`	`MediaUploadInfo.AnyFile(`
`607`	`607`	`file = processedFile,`
`608`		`- info = mockk(),`
	`608`	`+ fileInfo = mockk(),`
`609`	`609`	`)`
`610`	`610`	`)`
`611`	`611`	`)`
Original file line number	Diff line number	Diff line change
`@@ -46,36 +46,43 @@ class MediaSender @Inject constructor(`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`private suspend fun MatrixRoom.sendMedia(`
`49`		`- info: MediaUploadInfo,`
	`49`	`+ uploadInfo: MediaUploadInfo,`
`50`	`50`	`progressCallback: ProgressCallback?`
`51`	`51`	`): Result<Unit> {`
`52`		`- return when (info) {`
	`52`	`+ return when (uploadInfo) {`
`53`	`53`	`is MediaUploadInfo.Image -> {`
`54`	`54`	`sendImage(`
`55`		`- file = info.file,`
`56`		`- thumbnailFile = info.thumbnailFile,`
`57`		`- imageInfo = info.info,`
	`55`	`+ file = uploadInfo.file,`
	`56`	`+ thumbnailFile = uploadInfo.thumbnailFile,`
	`57`	`+ imageInfo = uploadInfo.imageInfo,`
`58`	`58`	`progressCallback = progressCallback`
`59`	`59`	`)`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`is MediaUploadInfo.Video -> {`
`63`	`63`	`sendVideo(`
`64`		`- file = info.file,`
`65`		`- thumbnailFile = info.thumbnailFile,`
`66`		`- videoInfo = info.info,`
	`64`	`+ file = uploadInfo.file,`
	`65`	`+ thumbnailFile = uploadInfo.thumbnailFile,`
	`66`	`+ videoInfo = uploadInfo.videoInfo,`
	`67`	`+ progressCallback = progressCallback`
	`68`	`+ )`
	`69`	`+ }`
	`70`	`+ is MediaUploadInfo.Audio -> {`
	`71`	`+ sendAudio(`
	`72`	`+ file = uploadInfo.file,`
	`73`	`+ audioInfo = uploadInfo.audioInfo,`
`67`	`74`	`progressCallback = progressCallback`
`68`	`75`	`)`
`69`	`76`	`}`
`70`	`77`
`71`	`78`	`is MediaUploadInfo.AnyFile -> {`
`72`	`79`	`sendFile(`
`73`		`- file = info.file,`
`74`		`- fileInfo = info.info,`
	`80`	`+ file = uploadInfo.file,`
	`81`	`+ fileInfo = uploadInfo.fileInfo,`
`75`	`82`	`progressCallback = progressCallback`
`76`	`83`	`)`
`77`	`84`	`}`
`78`		`- else -> Result.failure(IllegalStateException("Unexpected MediaUploadInfo format: $info"))`
	`85`	`+ else -> Result.failure(IllegalStateException("Unexpected MediaUploadInfo format: $uploadInfo"))`
`79`	`86`	`}`
`80`	`87`	`}`
`81`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ class AndroidMediaPreProcessor @Inject constructor(`
`133`	`133`	`removeSensitiveImageMetadata(compressionResult.file)`
`134`	`134`	`return MediaUploadInfo.Image(`
`135`	`135`	`file = compressionResult.file,`
`136`		`- info = imageInfo,`
	`136`	`+ imageInfo = imageInfo,`
`137`	`137`	`thumbnailFile = thumbnailResult.file`
`138`	`138`	`)`
`139`	`139`	`}`
`@@ -156,7 +156,7 @@ class AndroidMediaPreProcessor @Inject constructor(`
`156`	`156`	`removeSensitiveImageMetadata(file)`
`157`	`157`	`return MediaUploadInfo.Image(`
`158`	`158`	`file = file,`
`159`		`- info = imageInfo,`
	`159`	`+ imageInfo = imageInfo,`
`160`	`160`	`thumbnailFile = thumbnailResult.file`
`161`	`161`	`)`
`162`	`162`	`}`
`@@ -184,7 +184,7 @@ class AndroidMediaPreProcessor @Inject constructor(`
`184`	`184`	`val videoInfo = extractVideoMetadata(resultFile, mimeType, thumbnailInfo)`
`185`	`185`	`return MediaUploadInfo.Video(`
`186`	`186`	`file = resultFile,`
`187`		`- info = videoInfo,`
	`187`	`+ videoInfo = videoInfo,`
`188`	`188`	`thumbnailFile = thumbnailInfo.file`
`189`	`189`	`)`
`190`	`190`	`}`