From cb2e075e0cd4e2115d0728148b736eb265c6dc3b Mon Sep 17 00:00:00 2001 From: klaus Date: Thu, 8 Oct 2026 11:54:59 +0900 Subject: [PATCH] =?UTF-8?q?fix(gift):=20=EC=9D=B4=EB=A6=84=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=20=ED=95=84=ED=84=B0=EB=A5=BC=20=EB=B3=B4=EC=A0=95?= =?UTF-8?q?=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/v2/gift/GiftSendInputUi.kt | 18 +++++- .../v2/gift/GiftSendInputFiltersTest.kt | 56 +++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftSendInputFiltersTest.kt diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftSendInputUi.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftSendInputUi.kt index 782a1882..0022d020 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftSendInputUi.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftSendInputUi.kt @@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.v2.gift import android.content.Context import android.text.InputFilter +import android.text.SpannableStringBuilder import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter @@ -28,12 +29,18 @@ class GiftCategoryAdapter( } object GiftSendInputFilters { + fun isValidName(name: String): Boolean = NAME_REGEX.matches(name.trim()) + fun senderName() = InputFilter { source, start, end, _, _, _ -> - filterChars(source, start, end) { it.isLetterOrDigit() && (it.code < 128 || it in '가'..'힣') } + filterChars(source, start, end) { + it in 'A'..'Z' || it in 'a'..'z' || + it in '\u1100'..'\u11FF' || it in '\u3130'..'\u318F' || + it in '\uA960'..'\uA97F' || it in '\uAC00'..'\uD7A3' || it in '\uD7B0'..'\uD7FF' + } } fun phoneNumber() = InputFilter { source, start, end, _, _, _ -> - filterChars(source, start, end) { it.isDigit() } + filterChars(source, start, end) { it in '0'..'9' } } private fun filterChars( @@ -42,9 +49,14 @@ object GiftSendInputFilters { end: Int, accepts: (Char) -> Boolean ): CharSequence? { - val filtered = source.subSequence(start, end).filter(accepts) + val filtered = SpannableStringBuilder(source, start, end) + for (index in filtered.lastIndex downTo 0) { + if (!accepts(filtered[index])) filtered.delete(index, index + 1) + } return if (filtered.length == end - start) null else filtered } + + private val NAME_REGEX = Regex("^[가-힣A-Za-z]{1,12}$") } object GiftSendInputErrorBinder { diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftSendInputFiltersTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftSendInputFiltersTest.kt new file mode 100644 index 00000000..01e3bbd1 --- /dev/null +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftSendInputFiltersTest.kt @@ -0,0 +1,56 @@ +package kr.co.vividnext.sodalive.v2.gift + +import android.app.Application +import android.text.SpannableString +import android.text.Spanned +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], application = Application::class) +class GiftSendInputFiltersTest { + + @Test + fun `이름 필터는 한글 조합 문자와 composing span을 보존한다`() { + val marker = Any() + val composing = SpannableString("ㄱ").apply { + setSpan(marker, 0, length, Spanned.SPAN_COMPOSING) + } + + val unchanged = GiftSendInputFilters.senderName().filter(composing, 0, composing.length, EMPTY, 0, 0) + + assertNull(unchanged) + + val mixed = SpannableString("ㄱ1").apply { + setSpan(marker, 0, 1, Spanned.SPAN_COMPOSING) + } + val filtered = GiftSendInputFilters.senderName().filter(mixed, 0, mixed.length, EMPTY, 0, 0) + assertEquals("ㄱ", filtered.toString()) + assertTrue(filtered is Spanned) + assertEquals(0, (filtered as Spanned).getSpanStart(marker)) + assertEquals(1, filtered.getSpanEnd(marker)) + } + + @Test + fun `이름 필터는 한글과 영문 외 문자를 제거한다`() { + val filtered = GiftSendInputFilters.senderName().filter("홍Gil1 동!", 0, 8, EMPTY, 0, 0) + + assertEquals("홍Gil동", filtered.toString()) + } + + @Test + fun `휴대폰 필터는 ASCII 숫자 외 문자를 제거한다`() { + val filtered = GiftSendInputFilters.phoneNumber().filter("011-가2", 0, 6, EMPTY, 0, 0) + + assertEquals("012", filtered.toString()) + } + + private companion object { + val EMPTY = SpannableString("") + } +}