fix:TOP-88 유효하지 않은 Emoji코드를 파싱 시도하면 앱이 Crash나는 문제 수정

THT-Team · Nov 26, 2023 · 36415a6 · 36415a6
1 parent 486c4f1
commit 36415a6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/feature/signin/src/main/java/tht/feature/signin/signup/idealtype/IdealTypeFragment.kt b/feature/signin/src/main/java/tht/feature/signin/signup/idealtype/IdealTypeFragment.kt
@@ -116,11 +116,12 @@ class IdealTypeFragment : SignupRootBaseFragment<IdealTypeViewModel, FragmentIde
     }
 
     private fun addChip(ideal: IdealTypeModel, idx: Int) {
-        val code = Integer.decode("0x${ideal.emojiCode}")
-        val emoji = String(Character.toChars(code))
+        val emoji = StringUtil.parseEmoji(ideal.emojiCode).let {
+            if (it.isNullOrBlank()) "" else "$it "
+        }
         binding.groupChip.addView(
             getIdealChip().apply {
-                "$emoji ${ideal.title}".let {
+                "$emoji${ideal.title}".let {
                     text = it
                 }
                 setOnClickListener {

diff --git a/feature/signin/src/main/java/tht/feature/signin/signup/interest/InterestFragment.kt b/feature/signin/src/main/java/tht/feature/signin/signup/interest/InterestFragment.kt
@@ -117,11 +117,12 @@ class InterestFragment : SignupRootBaseFragment<InterestViewModel, FragmentInter
     }
 
     private fun addChip(interest: InterestModel, idx: Int) {
-        val code = Integer.decode("0x${interest.emojiCode}")
-        val emoji = String(Character.toChars(code))
+        val emoji = StringUtil.parseEmoji(interest.emojiCode).let {
+            if (it.isNullOrBlank()) "" else "$it "
+        }
         binding.groupChip.addView(
             getInterestChip().apply {
-                "$emoji ${interest.title}".let {
+                "$emoji${interest.title}".let {
                     text = it
                 }
                 setOnClickListener {

diff --git a/feature/signin/src/main/java/tht/feature/signin/util/StringUtil.kt b/feature/signin/src/main/java/tht/feature/signin/util/StringUtil.kt
@@ -6,6 +6,16 @@ import android.text.style.ForegroundColorSpan
 import android.widget.TextView
 
 object StringUtil {
+    fun parseEmoji(emojiCode: String): String? {
+        return try {
+            val code = Integer.decode("0x${emojiCode}")
+            String(Character.toChars(code))
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
+        }
+    }
+
     fun setWhiteTextColor(textView: TextView, range: IntRange) {
         textView.text = setTextColor(
             textView.text.toString(),