Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix @room mentions crashing in debug builds #3107

Merged
merged 2 commits into from
Jun 27, 2024
+17 −15
Merged

Fix @room mentions crashing in debug builds #3107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c5ef56
Fix `@room` mentions crashing in debug builds
jmartinesp Jun 27, 2024
bc967fe
Iterate on previous solution, add `MentionSpan.Type.EVERYONE`
jmartinesp Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .../element/android/features/messages/impl/timeline/components/event/TimelineItemTextView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,10 @@ private fun updateMentionSpans(text: CharSequence?, cache: RoomMemberProfilesCac
mentionSpan.text = displayName
}
}
// There's no need to do anything for `@room` pills
MentionSpan.Type.EVERYONE -> Unit
// Nothing yet for room mentions
else -> Unit
MentionSpan.Type.ROOM -> Unit
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions ...er/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpan.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ class MentionSpan(
append("#")
}
}
Type.EVERYONE -> Unit
}
append(mentionText.substring(0, min(mentionText.length, MAX_LENGTH)))
if (mentionText.length > MAX_LENGTH) {
Expand All @@ -98,6 +99,7 @@ class MentionSpan(
enum class Type {
USER,
ROOM,
EVERYONE,
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class MentionSpanProvider @AssistedInject constructor(
MentionSpan(
text = text,
rawValue = "@room",
type = MentionSpan.Type.USER,
type = MentionSpan.Type.EVERYONE,
backgroundColor = otherBackgroundColor,
textColor = otherTextColor,
startPadding = startPaddingPx,
Expand Down
22 changes: 10 additions & 12 deletions ...rc/main/kotlin/io/element/android/libraries/textcomposer/model/MarkdownTextEditorState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,16 @@
for (mention in mentions.reversed()) {
val start = charSequence.getSpanStart(mention)
val end = charSequence.getSpanEnd(mention)
if (mention.type == MentionSpan.Type.USER) {
if (mention.rawValue == "@room") {
replace(start, end, "@room")
} else {
when (mention.type) {
MentionSpan.Type.USER -> {
val link = permalinkBuilder.permalinkForUser(UserId(mention.rawValue)).getOrNull() ?: continue
replace(start, end, "[${mention.rawValue}]($link)")
}
MentionSpan.Type.EVERYONE -> {
replace(start, end, "@room")
}
// Nothing to do here yet
MentionSpan.Type.ROOM -> Unit

Check warning on line 105 in libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MarkdownTextEditorState.kt

View check run for this annotation

Codecov / codecov/patch

libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MarkdownTextEditorState.kt#L105 

Added line #L105 was not covered by tests
}
}
}
Expand All @@ -114,14 +117,9 @@
val mentionSpans = text.getSpans<MentionSpan>(0, text.length)
return mentionSpans.mapNotNull { mentionSpan ->
when (mentionSpan.type) {
MentionSpan.Type.USER -> {
if (mentionSpan.rawValue == "@room") {
Mention.AtRoom
} else {
Mention.User(UserId(mentionSpan.rawValue))
}
}
else -> null
MentionSpan.Type.USER -> Mention.User(UserId(mentionSpan.rawValue))
MentionSpan.Type.EVERYONE -> Mention.AtRoom
MentionSpan.Type.ROOM -> null

Check warning on line 122 in libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MarkdownTextEditorState.kt

View check run for this annotation

Codecov / codecov/patch

libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MarkdownTextEditorState.kt#L122 

Added line #L122 was not covered by tests
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...otlin/io/element/android/libraries/textcomposer/impl/model/MarkdownTextEditorStateTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class MarkdownTextEditorStateTest {

private fun aMarkdownTextWithMentions(): CharSequence {
val userMentionSpan = MentionSpan("@Alice", "@alice:matrix.org", MentionSpan.Type.USER, 0, 0, 0, 0)
val atRoomMentionSpan = MentionSpan("@room", "@room", MentionSpan.Type.USER, 0, 0, 0, 0)
val atRoomMentionSpan = MentionSpan("@room", "@room", MentionSpan.Type.EVERYONE, 0, 0, 0, 0)
return buildSpannedString {
append("Hello ")
inSpans(userMentionSpan) {
Expand Down
Loading