filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7519 from vector-im/bugfix/fre/unencrypted_media_event_json_type 

Fix bad content types when sending unencrypted media event with additional content data
This commit is contained in:
Florian Renaud 2022-11-04 10:40:18 +01:00 committed by GitHub
parent 4621488f21 c0ba2f2f48
commit ac0d823c88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7519.bugfix Normal file
View File

@ -0,0 +1 @@
Voice Broadcast - Fix error on voice messages in unencrypted rooms

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
View File

@ -408,7 +408,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
newAttachmentAttributes: NewAttachmentAttributes newAttachmentAttributes: NewAttachmentAttributes
) { ) {
localEchoRepository.updateEcho(eventId) { _, event -> localEchoRepository.updateEcho(eventId) { _, event ->
val content: Content? = event.asDomain().content val content: Content? = event.asDomain(castJsonNumbers = true).content
val messageContent: MessageContent? = content.toModel() val messageContent: MessageContent? = content.toModel()
// Retrieve potential additional content from the original event // Retrieve potential additional content from the original event
val additionalContent = content.orEmpty() - messageContent?.toContent().orEmpty().keys val additionalContent = content.orEmpty() - messageContent?.toContent().orEmpty().keys