TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-21 15:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1680 from oxen-io/fix-mention-crash

Browse Source 
Fix crashes when removing spaces in mention texts
This commit is contained in:
ThomasSession 2024-09-24 13:14:07 +10:00 committed by GitHub
commit 439ec900f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/mention/MentionViewModel.kt
View File

@ -202,13 +202,17 @@ class MentionViewModel(
val sb = StringBuilder() val sb = StringBuilder()
var offset = 0 var offset = 0
for ((span, range) in spansWithRanges) { for ((span, range) in spansWithRanges) {
// Add content before the mention span // Add content before the mention span. There's a possibility of overlapping spans so we need to
sb.append(editable, offset, range.first) // safe guard the start offset here to not go over our span's start.
val thisMentionStart = range.first
val lastMentionEnd = offset.coerceAtMost(thisMentionStart)
sb.append(editable, lastMentionEnd, thisMentionStart)
// Replace the mention span with "@public key" // Replace the mention span with "@public key"
sb.append('@').append(span.member.publicKey).append(' ') sb.append('@').append(span.member.publicKey).append(' ')
offset = range.last + 1 // Safe guard offset to not go over the end of the editable.
offset = (range.last + 1).coerceAtMost(editable.length)
} }
// Add the remaining content // Add the remaining content

5
app/src/test/java/org/thoughtcrime/securesms/conversation/v2/MentionViewModelTest.kt
View File

@ -179,6 +179,11 @@ class MentionViewModelTest {
// Should have normalised message with selected candidate // Should have normalised message with selected candidate
assertThat(mentionViewModel.normalizeMessageBody()) assertThat(mentionViewModel.normalizeMessageBody())
.isEqualTo("Hi @pubkey1 ") .isEqualTo("Hi @pubkey1 ")
// Should have correct normalised message even with the last space deleted
editable.delete(editable.length - 1, editable.length)
assertThat(mentionViewModel.normalizeMessageBody())
.isEqualTo("Hi @pubkey1 ")
} }
} }
} }