Skip to content

Commit 5d204a3

Browse files
committed
fixed exception while formatting phone number
1 parent 8810f54 commit 5d204a3

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

android/app/src/main/java/com/httpsms/LoginActivity.kt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,23 @@ class LoginActivity : AppCompatActivity() {
239239
}
240240

241241
private fun formatE164(number: String): String {
242-
return PhoneNumberUtils.formatNumberToE164(
243-
addPlus(number.trim()),
242+
var phoneNumber = number.trim()
243+
if (!number.startsWith("+")) {
244+
phoneNumber = "+$number"
245+
}
246+
247+
Timber.d("formatting phone number [${phoneNumber}] into e164")
248+
249+
val formattedNumber = PhoneNumberUtils.formatNumberToE164(
250+
phoneNumber,
244251
this.resources.configuration.locales.get(0).country
245252
)
253+
254+
if (formattedNumber !== null) {
255+
return formattedNumber
256+
}
257+
258+
return phoneNumber;
246259
}
247260

248261
private fun addPlus(number: String): String {

0 commit comments

Comments
 (0)