Skip to content

Commit 13ec183

Browse files
committed
MediaPreProcessor: remove default value of parameter deleteOriginal. No functional change here.
1 parent 64b1f30 commit 13ec183

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,12 @@ class ConfigureRoomPresenter @Inject constructor(
175175
}
176176

177177
private suspend fun uploadAvatar(avatarUri: Uri): String {
178-
val preprocessed = mediaPreProcessor.process(avatarUri, MimeTypes.Jpeg, compressIfPossible = false).getOrThrow()
178+
val preprocessed = mediaPreProcessor.process(
179+
uri = avatarUri,
180+
mimeType = MimeTypes.Jpeg,
181+
deleteOriginal = false,
182+
compressIfPossible = false,
183+
).getOrThrow()
179184
val byteArray = preprocessed.file.readBytes()
180185
return matrixClient.uploadMedia(MimeTypes.Jpeg, byteArray, null).getOrThrow()
181186
}

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,12 @@ class EditUserProfilePresenter @AssistedInject constructor(
155155
private suspend fun updateAvatar(avatarUri: Uri?): Result<Unit> {
156156
return runCatching {
157157
if (avatarUri != null) {
158-
val preprocessed = mediaPreProcessor.process(avatarUri, MimeTypes.Jpeg, compressIfPossible = false).getOrThrow()
158+
val preprocessed = mediaPreProcessor.process(
159+
uri = avatarUri,
160+
mimeType = MimeTypes.Jpeg,
161+
deleteOriginal = false,
162+
compressIfPossible = false,
163+
).getOrThrow()
159164
matrixClient.uploadAvatar(MimeTypes.Jpeg, preprocessed.file.readBytes()).getOrThrow()
160165
} else {
161166
matrixClient.removeAvatar().getOrThrow()

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,12 @@ class RoomDetailsEditPresenter @Inject constructor(
202202
private suspend fun updateAvatar(avatarUri: Uri?): Result<Unit> {
203203
return runCatching {
204204
if (avatarUri != null) {
205-
val preprocessed = mediaPreProcessor.process(avatarUri, MimeTypes.Jpeg, compressIfPossible = false).getOrThrow()
205+
val preprocessed = mediaPreProcessor.process(
206+
uri = avatarUri,
207+
mimeType = MimeTypes.Jpeg,
208+
deleteOriginal = false,
209+
compressIfPossible = false,
210+
).getOrThrow()
206211
room.updateAvatar(MimeTypes.Jpeg, preprocessed.file.readBytes()).getOrThrow()
207212
} else {
208213
room.removeAvatar().getOrThrow()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ interface MediaPreProcessor {
1818
suspend fun process(
1919
uri: Uri,
2020
mimeType: String,
21-
deleteOriginal: Boolean = false,
22-
compressIfPossible: Boolean
21+
deleteOriginal: Boolean,
22+
compressIfPossible: Boolean,
2323
): Result<MediaUploadInfo>
2424

2525
data class Failure(override val cause: Throwable?) : Exception(cause)

0 commit comments

Comments
 (0)