ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-04 01:19:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Send SVG images as files (#4595)"

Browse Source
This commit is contained in:
bxdxnn
2026-06-14 10:06:17 +00:00
parent a3a0fdad32
commit 88d419c03f
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/core/src/main/kotlin/io/element/android/libraries/core/mimetype/MimeTypes.kt
-1
View File
@@ -26,7 +26,6 @@ object MimeTypes {
const val Jpeg = "image/jpeg" const val Jpeg = "image/jpeg"
const val Gif = "image/gif" const val Gif = "image/gif"
const val WebP = "image/webp" const val WebP = "image/webp"
const val Svg = "image/svg+xml"
const val Videos = "video/*" const val Videos = "video/*"
const val Mp4 = "video/mp4" const val Mp4 = "video/mp4"
libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessor.kt
+1 -5
View File
@@ -67,7 +67,7 @@ class AndroidMediaPreProcessor(
*/ */
private const val IMAGE_SCALE_REF_SIZE = 640 private const val IMAGE_SCALE_REF_SIZE = 640
private val notCompressibleImageTypes = listOf(MimeTypes.Gif, MimeTypes.WebP, MimeTypes.Svg) private val notCompressibleImageTypes = listOf(MimeTypes.Gif, MimeTypes.WebP)
} }
private val contentResolver = context.contentResolver private val contentResolver = context.contentResolver
@@ -83,10 +83,6 @@ class AndroidMediaPreProcessor(
): Result<MediaUploadInfo> = withContext(coroutineDispatchers.computation) { ): Result<MediaUploadInfo> = withContext(coroutineDispatchers.computation) {
runCatchingExceptions { runCatchingExceptions {
val result = when { val result = when {
// Special case for SVG, since Android can't read its metadata or create a thumbnail, it must be sent as a file
mimeType == MimeTypes.Svg -> {
processFile(uri, mimeType)
}
mimeType.isMimeTypeImage() -> { mimeType.isMimeTypeImage() -> {
val shouldBeCompressed = mediaOptimizationConfig.compressImages && mimeType !in notCompressibleImageTypes val shouldBeCompressed = mediaOptimizationConfig.compressImages && mimeType !in notCompressibleImageTypes
processImage(uri, mimeType, shouldBeCompressed) processImage(uri, mimeType, shouldBeCompressed)