From 17ece54cb0973d35e1e521eac3b6af9f9a58ea94 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 16 Apr 2020 10:16:10 +0200 Subject: [PATCH] `mimetype` field is optional --- CHANGES.md | 1 + .../android/api/session/room/model/message/AudioInfo.kt | 2 +- .../android/api/session/room/model/message/ThumbnailInfo.kt | 2 +- .../internal/session/room/send/LocalEchoEventFactory.kt | 5 ++--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4ca393ab73..1ed4d31224 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -31,6 +31,7 @@ Bugfix 🐛: - Cross-Signing | web <-> riotX After QR code scan, gossiping fails (#1210) - Fix crash when trying to download file without internet connection (#1229) - 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 🗣: - diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/AudioInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/AudioInfo.kt index eef6b283c6..877746705f 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/AudioInfo.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/AudioInfo.kt @@ -24,7 +24,7 @@ data class AudioInfo( /** * 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. diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ThumbnailInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ThumbnailInfo.kt index 0ef1b8f658..0ee6b88e01 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ThumbnailInfo.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ThumbnailInfo.kt @@ -39,5 +39,5 @@ data class ThumbnailInfo( /** * The mimetype of the image, e.g. "image/jpeg". */ - @Json(name = "mimetype") val mimeType: String + @Json(name = "mimetype") val mimeType: String? ) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt index a4a6eb6972..5f0515e669 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt @@ -314,7 +314,7 @@ internal class LocalEchoEventFactory @Inject constructor( msgType = MessageType.MSGTYPE_AUDIO, body = attachment.name ?: "audio", audioInfo = AudioInfo( - mimeType = attachment.getSafeMimeType()?.takeIf { it.isNotBlank() } ?: "audio/mpeg", + mimeType = attachment.getSafeMimeType()?.takeIf { it.isNotBlank() }, size = attachment.size ), url = attachment.queryUri.toString() @@ -327,8 +327,7 @@ internal class LocalEchoEventFactory @Inject constructor( msgType = MessageType.MSGTYPE_FILE, body = attachment.name ?: "file", info = FileInfo( - mimeType = attachment.getSafeMimeType()?.takeIf { it.isNotBlank() } - ?: "application/octet-stream", + mimeType = attachment.getSafeMimeType()?.takeIf { it.isNotBlank() }, size = attachment.size ), url = attachment.queryUri.toString()