ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 16:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
alternateText can't be an empty string. #955
This commit is contained in:
Benoit Marty
2023-07-25 09:43:08 +02:00
committed by GitHub
parent 61a3705c2e b2394b6adc
commit 9d64edfa61
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/html/HtmlDocument.kt
+13 -3
View File
@@ -544,17 +544,27 @@ private fun AnnotatedString.Builder.appendLink(link: Element) {
pop() pop()
} }
is PermalinkData.RoomEmailInviteLink -> { is PermalinkData.RoomEmailInviteLink -> {
appendInlineContent(CHIP_ID, link.ownText()) safeAppendInlineContent(CHIP_ID, link.ownText())
} }
is PermalinkData.RoomLink -> { is PermalinkData.RoomLink -> {
appendInlineContent(CHIP_ID, link.ownText()) safeAppendInlineContent(CHIP_ID, link.ownText())
} }
is PermalinkData.UserLink -> { 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 @Composable
private fun HtmlText( private fun HtmlText(
text: AnnotatedString, text: AnnotatedString,