Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make e164 formatter more leinent with + prefix.

Browse Source
This commit is contained in:
Cody Henthorne
2025-04-23 14:24:14 -04:00
parent 09b818b048
commit 501e169210
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core-util-jvm/src/main/java/org/signal/core/util/E164Util.kt
View File

@@ -253,12 +253,18 @@ object E164Util {
* a phone number.
*/
fun formatAsE164(input: String): String? {
return formatAsE164WithRegionCode(
val formatted = formatAsE164WithRegionCode(
localNumber = localNumber,
localAreaCode = localAreaCode,
regionCode = localRegionCode,
input = input
)
return if (formatted == null && input.startsWith("+")) {
formatAsE164(input.substring(1))
} else {
formatted
}
}
/**

4
core-util-jvm/src/test/java/org/signal/core/util/E164UtilTest.kt
View File

@@ -98,7 +98,9 @@ class E164UtilTest {
@Test
fun `formatAsE164 - short codes`() {
val formatter: E164Util.Formatter = E164Util.createFormatterForE164("+14152222222")
Assert.assertEquals("40404", formatter.formatAsE164("40404"))
Assert.assertEquals("+40404", formatter.formatAsE164("+40404"))
Assert.assertEquals("7726", formatter.formatAsE164("+7726"))
Assert.assertEquals("69987", formatter.formatAsE164("+69987"))
Assert.assertEquals("40404", formatter.formatAsE164("40404"))
Assert.assertEquals("7726", formatter.formatAsE164("7726"))
Assert.assertEquals("22000", formatter.formatAsE164("22000"))