Browse Source

Merge pull request #956 from vector-im/feature/bma/fixAlternateTextCrash

alternateText can't be an empty string. #955
pull/959/head
Benoit Marty 1 year ago committed by GitHub
parent
commit
9d64edfa61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/html/HtmlDocument.kt

16
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/html/HtmlDocument.kt

@ -544,17 +544,27 @@ private fun AnnotatedString.Builder.appendLink(link: Element) { @@ -544,17 +544,27 @@ private fun AnnotatedString.Builder.appendLink(link: Element) {
pop()
}
is PermalinkData.RoomEmailInviteLink -> {
appendInlineContent(CHIP_ID, link.ownText())
safeAppendInlineContent(CHIP_ID, link.ownText())
}
is PermalinkData.RoomLink -> {
appendInlineContent(CHIP_ID, link.ownText())
safeAppendInlineContent(CHIP_ID, link.ownText())
}
is PermalinkData.UserLink -> {
appendInlineContent(CHIP_ID, link.ownText())
safeAppendInlineContent(CHIP_ID, link.ownText())
}
}
}
fun AnnotatedString.Builder.safeAppendInlineContent(chipId: String, ownText: String) {
if (ownText.isEmpty()) {
// alternateText cannot be empty and default parameter value is private,
// so just omit the second param here.
appendInlineContent(chipId)
} else {
appendInlineContent(chipId, ownText)
}
}
@Composable
private fun HtmlText(
text: AnnotatedString,

Loading…
Cancel
Save