chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

Fix issue #1174 with span parsing (#1183)

Browse source
This commit is contained in:
Levi Bard 2019-04-08 15:27:41 +02:00 committed by Konrad Pozniak
parent badfff0f46
commit a2fa49aafb
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/keylesspalace/tusky/util/SpanUtils.kt
View file

@ -70,7 +70,10 @@ private fun findPattern(string: String, fromIndex: Int): FindCharsResult {
result.matchType = matchType result.matchType = matchType
result.start = Math.max(0, i - finder.searchPrefixWidth) result.start = Math.max(0, i - finder.searchPrefixWidth)
findEndOfPattern(string, result, finder.pattern) findEndOfPattern(string, result, finder.pattern)
return result if (result.start + finder.searchPrefixWidth <= i + 1 && // The found result is actually triggered by the correct search character
result.end >= result.start) { // ...and we actually found a valid result
return result
}
} }
} }
} }

2
app/src/test/java/com/keylesspalace/tusky/SpanUtilsTest.kt
View file

@ -10,7 +10,7 @@ import org.junit.runners.Parameterized
class SpanUtilsTest { class SpanUtilsTest {
@Test @Test
fun matchesMixedSpans() { fun matchesMixedSpans() {
val input = "one #one two @two three https://thr.ee/meh?foo=bar&wat=@at#hmm four #four five @five" val input = "one #one two: @two three : https://thr.ee/meh?foo=bar&wat=@at#hmm four #four five @five"
val inputSpannable = FakeSpannable(input) val inputSpannable = FakeSpannable(input)
highlightSpans(inputSpannable, 0xffffff) highlightSpans(inputSpannable, 0xffffff)
val spans = inputSpannable.spans val spans = inputSpannable.spans