Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

MediaPreProcessor: remove default value of parameter deleteOriginal. No functional change here.

Browse source
This commit is contained in:
Benoit Marty 2024-11-06 11:46:05 +01:00
parent 3a8f55d216
commit 495e4b3d60
4 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -175,7 +175,12 @@ class ConfigureRoomPresenter @Inject constructor(
} }
private suspend fun uploadAvatar(avatarUri: Uri): String { 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() val byteArray = preprocessed.file.readBytes()
return matrixClient.uploadMedia(MimeTypes.Jpeg, byteArray, null).getOrThrow() return matrixClient.uploadMedia(MimeTypes.Jpeg, byteArray, null).getOrThrow()
} }

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

@ -155,7 +155,12 @@ class EditUserProfilePresenter @AssistedInject constructor(
private suspend fun updateAvatar(avatarUri: Uri?): Result<Unit> { private suspend fun updateAvatar(avatarUri: Uri?): Result<Unit> {
return runCatching { return runCatching {
if (avatarUri != null) { 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() matrixClient.uploadAvatar(MimeTypes.Jpeg, preprocessed.file.readBytes()).getOrThrow()
} else { } else {
matrixClient.removeAvatar().getOrThrow() matrixClient.removeAvatar().getOrThrow()

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

@ -202,7 +202,12 @@ class RoomDetailsEditPresenter @Inject constructor(
private suspend fun updateAvatar(avatarUri: Uri?): Result<Unit> { private suspend fun updateAvatar(avatarUri: Uri?): Result<Unit> {
return runCatching { return runCatching {
if (avatarUri != null) { 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() room.updateAvatar(MimeTypes.Jpeg, preprocessed.file.readBytes()).getOrThrow()
} else { } else {
room.removeAvatar().getOrThrow() room.removeAvatar().getOrThrow()

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

@ -18,8 +18,8 @@ interface MediaPreProcessor {
suspend fun process( suspend fun process(
uri: Uri, uri: Uri,
mimeType: String, mimeType: String,
deleteOriginal: Boolean = false, deleteOriginal: Boolean,
compressIfPossible: Boolean compressIfPossible: Boolean,
): Result<MediaUploadInfo> ): Result<MediaUploadInfo>
data class Failure(override val cause: Throwable?) : Exception(cause) data class Failure(override val cause: Throwable?) : Exception(cause)