`mimetype` field is optional

This commit is contained in:
Benoit Marty 2020-04-16 10:16:10 +02:00
parent da04a74350
commit 17ece54cb0
4 changed files with 5 additions and 5 deletions

View File

@ -31,6 +31,7 @@ Bugfix 🐛:
- Cross-Signing | web <-> riotX After QR code scan, gossiping fails (#1210) - Cross-Signing | web <-> riotX After QR code scan, gossiping fails (#1210)
- Fix crash when trying to download file without internet connection (#1229) - Fix crash when trying to download file without internet connection (#1229)
- Local echo are not updated in timeline (for failed & encrypted states) - Local echo are not updated in timeline (for failed & encrypted states)
- Render image event even if thumbnail_info does not have mimetype defined (#1209)
Translations 🗣: Translations 🗣:
- -

View File

@ -24,7 +24,7 @@ data class AudioInfo(
/** /**
* The mimetype of the audio e.g. "audio/aac". * The mimetype of the audio e.g. "audio/aac".
*/ */
@Json(name = "mimetype") val mimeType: String, @Json(name = "mimetype") val mimeType: String?,
/** /**
* The size of the audio clip in bytes. * The size of the audio clip in bytes.

View File

@ -39,5 +39,5 @@ data class ThumbnailInfo(
/** /**
* The mimetype of the image, e.g. "image/jpeg". * The mimetype of the image, e.g. "image/jpeg".
*/ */
@Json(name = "mimetype") val mimeType: String @Json(name = "mimetype") val mimeType: String?
) )

View File

@ -314,7 +314,7 @@ internal class LocalEchoEventFactory @Inject constructor(
msgType = MessageType.MSGTYPE_AUDIO, msgType = MessageType.MSGTYPE_AUDIO,
body = attachment.name ?: "audio", body = attachment.name ?: "audio",
audioInfo = AudioInfo( audioInfo = AudioInfo(
mimeType = attachment.getSafeMimeType()?.takeIf { it.isNotBlank() } ?: "audio/mpeg", mimeType = attachment.getSafeMimeType()?.takeIf { it.isNotBlank() },
size = attachment.size size = attachment.size
), ),
url = attachment.queryUri.toString() url = attachment.queryUri.toString()
@ -327,8 +327,7 @@ internal class LocalEchoEventFactory @Inject constructor(
msgType = MessageType.MSGTYPE_FILE, msgType = MessageType.MSGTYPE_FILE,
body = attachment.name ?: "file", body = attachment.name ?: "file",
info = FileInfo( info = FileInfo(
mimeType = attachment.getSafeMimeType()?.takeIf { it.isNotBlank() } mimeType = attachment.getSafeMimeType()?.takeIf { it.isNotBlank() },
?: "application/octet-stream",
size = attachment.size size = attachment.size
), ),
url = attachment.queryUri.toString() url = attachment.queryUri.toString()