empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ensure filter is not retriggered when formatting.

Browse source 
Fixes #13876
This commit is contained in:
Alex Hart 2025-01-06 13:00:31 -04:00 • committed by GitHub
parent a504c9dd56
commit c5207cb8a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt
View file

@ -297,17 +297,15 @@ data class Boost(
if (value != null) { if (value != null) {
val formatted = formatter.format(value) val formatted = formatter.format(value)
text?.removeTextChangedListener(this) modifyEditable {
s.replace(0, s.length, formatted)
s.replace(0, s.length, formatted) if (formatted.endsWith(symbol)) {
if (formatted.endsWith(symbol)) { val result: MatchResult? = symbolPattern.find(formatted)
val result: MatchResult? = symbolPattern.find(formatted) if (result != null && result.range.first < s.length) {
if (result != null && result.range.first < s.length) { text?.setSelection(result.range.first)
text?.setSelection(result.range.first) }
} }
} }
text?.addTextChangedListener(this)
} }
} }
@ -325,16 +323,24 @@ data class Boost(
} }
if (withoutSymbol != withoutLeadingZeroes) { if (withoutSymbol != withoutLeadingZeroes) {
text?.removeTextChangedListener(this) modifyEditable {
val start = s.indexOf(withoutSymbol)
val start = s.indexOf(withoutSymbol) s.replace(start, start + withoutSymbol.length, withoutLeadingZeroes)
s.replace(start, start + withoutSymbol.length, withoutLeadingZeroes) }
text?.addTextChangedListener(this)
} }
onCustomAmountChanged(s.removePrefix(symbol).removeSuffix(symbol).trim().toString()) onCustomAmountChanged(s.removePrefix(symbol).removeSuffix(symbol).trim().toString())
} }
private fun modifyEditable(modification: () -> Unit) {
text?.removeTextChangedListener(this)
text?.keyListener = null
modification()
text?.addTextChangedListener(this)
text?.keyListener = this
}
} }
companion object { companion object {

16
app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostTest__MoneyFilter.kt
View file

@ -2,6 +2,9 @@ package org.thoughtcrime.securesms.components.settings.app.subscription.boost
import android.app.Application import android.app.Application
import android.text.SpannableStringBuilder import android.text.SpannableStringBuilder
import android.widget.TextView
import androidx.appcompat.widget.AppCompatEditText
import androidx.test.core.app.ApplicationProvider
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotNull import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull import org.junit.Assert.assertNull
@ -96,6 +99,19 @@ class BoostTest__MoneyFilter {
assertNull(filterResult) assertNull(filterResult)
} }
@Test
fun `Given USD, when I enter 1000, then I expect successful filter`() {
val view = AppCompatEditText(ApplicationProvider.getApplicationContext())
val testSubject = Boost.MoneyFilter(usd, text = view)
view.keyListener = testSubject
view.addTextChangedListener(testSubject)
view.setText("1000", TextView.BufferType.EDITABLE)
assertEquals("$1,000", view.text.toString())
}
@Test @Test
fun `Given JPY, when I enter 5, then I expect yen 5`() { fun `Given JPY, when I enter 5, then I expect yen 5`() {
val testSubject = Boost.MoneyFilter(yen) val testSubject = Boost.MoneyFilter(yen)