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

Improve default mime type.

Browse source
This commit is contained in:
Benoit Marty 2023-09-26 13:53:25 +02:00 • committed by Benoit Marty
parent c380ed538d
commit 45cd853c21
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt
View file

@ -109,14 +109,17 @@ class TimelineItemContentMessageFactory @Inject constructor(
formattedFileSize = fileSizeFormatter.format(messageType.info?.size ?: 0), formattedFileSize = fileSizeFormatter.format(messageType.info?.size ?: 0),
fileExtension = fileExtensionExtractor.extractFromName(messageType.body) fileExtension = fileExtensionExtractor.extractFromName(messageType.body)
) )
is FileMessageType -> TimelineItemFileContent( is FileMessageType -> {
body = messageType.body, val fileExtension = fileExtensionExtractor.extractFromName(messageType.body)
thumbnailSource = messageType.info?.thumbnailSource, TimelineItemFileContent(
fileSource = messageType.source, body = messageType.body,
mimeType = messageType.info?.mimetype ?: MimeTypes.OctetStream, thumbnailSource = messageType.info?.thumbnailSource,
formattedFileSize = fileSizeFormatter.format(messageType.info?.size ?: 0), fileSource = messageType.source,
fileExtension = fileExtensionExtractor.extractFromName(messageType.body) mimeType = messageType.info?.mimetype ?: MimeTypes.fromFileExtension(fileExtension),
) formattedFileSize = fileSizeFormatter.format(messageType.info?.size ?: 0),
fileExtension = fileExtension
)
}
is NoticeMessageType -> TimelineItemNoticeContent( is NoticeMessageType -> TimelineItemNoticeContent(
body = messageType.body, body = messageType.body,
htmlDocument = messageType.formatted?.toHtmlDocument(), htmlDocument = messageType.formatted?.toHtmlDocument(),

8
libraries/core/src/main/kotlin/io/element/android/libraries/core/mimetype/MimeTypes.kt
View file

@ -51,4 +51,12 @@ object MimeTypes {
fun String?.isMimeTypeFile() = this?.startsWith("file/").orFalse() fun String?.isMimeTypeFile() = this?.startsWith("file/").orFalse()
fun String?.isMimeTypeText() = this?.startsWith("text/").orFalse() fun String?.isMimeTypeText() = this?.startsWith("text/").orFalse()
fun String?.isMimeTypeAny() = this?.startsWith("*/").orFalse() fun String?.isMimeTypeAny() = this?.startsWith("*/").orFalse()
fun fromFileExtension(fileExtension: String): String {
return when (fileExtension.lowercase()) {
"apk" -> Apk
"pdf" -> Pdf
else -> OctetStream
}
}
} }