diff --git a/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt b/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt index 01b6b188..55c66a9c 100644 --- a/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt +++ b/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt @@ -69,4 +69,14 @@ class PhoneNumberUtilsTest { assertFalse(phoneNumberUtils.compare("123 456 7890", "234 567 8901")) } + @Test + fun compare_formatted_SenderID_returnsTrue() { + assertTrue(phoneNumberUtils.compare("Vi-CARE-S", "ViCARES")) + } + + @Test + fun compare_different_SenderID_returnsFalse() { + assertFalse(phoneNumberUtils.compare("VM-ViCARE-S", "VZ-ViCARE-S")) + } + } diff --git a/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt b/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt index 24b62caf..52cd76c5 100644 --- a/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt @@ -68,9 +68,8 @@ class PhoneNumberUtils @Inject constructor(context: Context) { return PhoneNumberUtils.formatNumber(number.toString(), countryCode) ?: number.toString() } - fun normalizeNumber(number: String): String { - return PhoneNumberUtils.stripSeparators(number) - } + fun normalizeNumber(number: String): String = + number.filter { it.isLetterOrDigit() || it in "+*#" } private fun parse(number: CharSequence): Phonenumber.PhoneNumber? { return tryOrNull(false) { phoneNumberUtil.parse(number, countryCode) }