jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rendering voice message if the waveform data is corrupted.

This commit is contained in:
Onuray Sahin 2021-09-08 13:20:56 +03:00
parent c6a99f1bb1
commit 1df867f345
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Voice Message - Cannot render voice message if the waveform data is corrupted

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

@ -36,7 +36,7 @@ data class ContentAttachmentData(
val queryUri: Uri,
val mimeType: String?,
val type: Type,
val waveform: List<Int>? = null
val waveform: List<Int?>? = null
) : Parcelable {
@JsonClass(generateAdapter = false)

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioWaveformInfo.kt
View File

@ -32,5 +32,5 @@ data class AudioWaveformInfo(
* List of integers between zero and 1024, inclusive.
*/
@Json(name = "waveform")
val waveform: List<Int>? = null
val waveform: List<Int?>? = null
)

8
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/WaveFormSanitizer.kt
View File

@ -33,7 +33,7 @@ internal class WaveFormSanitizer @Inject constructor() {
* The array should have no less than 30 elements and no more than 120.
* List of integers between zero and 1024, inclusive.
*/
fun sanitize(waveForm: List<Int>?): List<Int>? {
fun sanitize(waveForm: List<Int?>?): List<Int>? {
if (waveForm.isNullOrEmpty()) {
return null
}
@ -46,7 +46,7 @@ internal class WaveFormSanitizer @Inject constructor() {
val repeatTimes = ceil(MIN_NUMBER_OF_VALUES / waveForm.size.toDouble()).toInt()
waveForm.map { value ->
repeat(repeatTimes) {
sizeInRangeList.add(value)
sizeInRangeList.add(value ?: 0)
}
}
}
@ -54,12 +54,12 @@ internal class WaveFormSanitizer @Inject constructor() {
val keepOneOf = ceil(waveForm.size.toDouble() / MAX_NUMBER_OF_VALUES).toInt()
waveForm.mapIndexed { idx, value ->
if (idx % keepOneOf == 0) {
sizeInRangeList.add(value)
sizeInRangeList.add(value ?: 0)
}
}
}
else -> {
sizeInRangeList.addAll(waveForm)
sizeInRangeList.addAll(waveForm.filterNotNull())
}
}

12
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
View File

@ -622,11 +622,13 @@ class MessageItemFactory @Inject constructor(
.highlighted(highlight)
}
private fun List<Int>?.toFft(): List<Int>? {
return this?.map {
// Value comes from AudioRecordView.maxReportableAmp, and 1024 is the max value in the Matrix spec
it * 22760 / 1024
}
private fun List<Int?>?.toFft(): List<Int>? {
return this
?.filterNotNull()
?.map {
// Value comes from AudioRecordView.maxReportableAmp, and 1024 is the max value in the Matrix spec
it * 22760 / 1024
}
}
companion object {