MediaPreProcessor: remove default value of parameter deleteOriginal…

…. No functional change here.
element-hq · Nov 8, 2024 · 13ec183 · 13ec183
1 parent 64b1f30
commit 13ec183
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/...otlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt b/...otlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
@@ -175,7 +175,12 @@ class ConfigureRoomPresenter @Inject constructor(
     }
 
     private suspend fun uploadAvatar(avatarUri: Uri): String {
-        val preprocessed = mediaPreProcessor.process(avatarUri, MimeTypes.Jpeg, compressIfPossible = false).getOrThrow()
+        val preprocessed = mediaPreProcessor.process(
+            uri = avatarUri,
+            mimeType = MimeTypes.Jpeg,
+            deleteOriginal = false,
+            compressIfPossible = false,
+        ).getOrThrow()
         val byteArray = preprocessed.file.readBytes()
         return matrixClient.uploadMedia(MimeTypes.Jpeg, byteArray, null).getOrThrow()
     }

diff --git a/...io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt b/...io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt
@@ -155,7 +155,12 @@ class EditUserProfilePresenter @AssistedInject constructor(
     private suspend fun updateAvatar(avatarUri: Uri?): Result<Unit> {
         return runCatching {
             if (avatarUri != null) {
-                val preprocessed = mediaPreProcessor.process(avatarUri, MimeTypes.Jpeg, compressIfPossible = false).getOrThrow()
+                val preprocessed = mediaPreProcessor.process(
+                    uri = avatarUri,
+                    mimeType = MimeTypes.Jpeg,
+                    deleteOriginal = false,
+                    compressIfPossible = false,
+                ).getOrThrow()
                 matrixClient.uploadAvatar(MimeTypes.Jpeg, preprocessed.file.readBytes()).getOrThrow()
             } else {
                 matrixClient.removeAvatar().getOrThrow()

diff --git a/...main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt b/...main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt
@@ -202,7 +202,12 @@ class RoomDetailsEditPresenter @Inject constructor(
     private suspend fun updateAvatar(avatarUri: Uri?): Result<Unit> {
         return runCatching {
             if (avatarUri != null) {
-                val preprocessed = mediaPreProcessor.process(avatarUri, MimeTypes.Jpeg, compressIfPossible = false).getOrThrow()
+                val preprocessed = mediaPreProcessor.process(
+                    uri = avatarUri,
+                    mimeType = MimeTypes.Jpeg,
+                    deleteOriginal = false,
+                    compressIfPossible = false,
+                ).getOrThrow()
                 room.updateAvatar(MimeTypes.Jpeg, preprocessed.file.readBytes()).getOrThrow()
             } else {
                 room.removeAvatar().getOrThrow()

diff --git a/...oad/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaPreProcessor.kt b/...oad/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaPreProcessor.kt
@@ -18,8 +18,8 @@ interface MediaPreProcessor {
     suspend fun process(
         uri: Uri,
         mimeType: String,
-        deleteOriginal: Boolean = false,
-        compressIfPossible: Boolean
+        deleteOriginal: Boolean,
+        compressIfPossible: Boolean,
     ): Result<MediaUploadInfo>
 
     data class Failure(override val cause: Throwable?) : Exception(cause)