Sanitize mobile numbers

Author: MarkNjunge

app/src/main/java/com/marknkamau/justjava/ui/completeSignUp/CompleteSignUpActivity.kt

@@ -9,10 +9,7 @@ import androidx.lifecycle.Observer
 import com.marknjunge.core.data.model.Resource
 import com.marknjunge.core.data.model.User
 import com.marknkamau.justjava.R
-import com.marknkamau.justjava.utils.isValidEmail
-import com.marknkamau.justjava.utils.resetErrorOnChange
-import com.marknkamau.justjava.utils.toast
-import com.marknkamau.justjava.utils.trimmedText
+import com.marknkamau.justjava.utils.*
 import kotlinx.android.synthetic.main.activity_complete_sign_up.*
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
@@ -80,6 +77,8 @@ class CompleteSignUpActivity : AppCompatActivity() {
     private fun isValid(): Boolean {
         var valid = true
 
+        etMobileNumber.setText(PhoneNumberUtils.sanitize(etMobileNumber.text.toString()))
+
         if (etFirstName.trimmedText.isEmpty()) {
             valid = false
             tilFirstName.error = "Required"
@@ -93,9 +92,6 @@ class CompleteSignUpActivity : AppCompatActivity() {
         if (etMobileNumber.trimmedText.isEmpty()) {
             valid = false
             tilMobileNumber.error = "Required"
-        } else if (etMobileNumber.trimmedText.length != 12) {
-            valid = false
-            tilMobileNumber.error = "Please enter a valid mobile number"
         }
 
         if (etEmail.trimmedText.isEmpty()) {

app/src/main/java/com/marknkamau/justjava/ui/signup/SignUpActivity.kt

@@ -65,6 +65,8 @@ class SignUpActivity : AppCompatActivity() {
     private fun isValid(): Boolean {
         var isValid = true
 
+        etMobileNumber.setText(PhoneNumberUtils.sanitize(etMobileNumber.text.toString()))
+
         val justJavaEmailPattern = Pattern.compile("^([a-zA-Z0-9_.-])+@justjava.com+")
         val justJavaEmailMatcher = justJavaEmailPattern.matcher(etEmail.trimmedText)
 
@@ -100,9 +102,6 @@ class SignUpActivity : AppCompatActivity() {
         if (etMobileNumber.trimmedText.isEmpty()) {
             tilMobileNumber.error = getString(R.string.required)
             isValid = false
-        } else if (etMobileNumber.trimmedText.length != 12) {
-            tilMobileNumber.error = "Please enter a valid mobile number"
-            isValid = false
         }
 
         return isValid

app/src/main/java/com/marknkamau/justjava/utils/PhoneNumberUtils.kt

@@ -0,0 +1,17 @@
+package com.marknkamau.justjava.utils
+
+object PhoneNumberUtils {
+    fun sanitize(number: String): String {
+        val num = number.replace(" ", "")
+        return when {
+            num.startsWith("0") -> num.replaceFirst("^0".toRegex(), "254")
+            num.startsWith("+") -> num.replaceFirst("^\\+".toRegex(), "")
+            else -> number
+        }
+    }
+
+    fun beautify(number: String): String {
+        val num = sanitize(number)
+        return "+${num.subSequence(0, 3)} ${num.subSequence(3, 6)} ${num.subSequence(6, 9)} ${num.subSequence(9, 12)}"
+    }
+}

app/src/test/java/com/marknkamau/justjava/utils/PhoneNumberUtilsTest.kt

@@ -0,0 +1,27 @@
+package com.marknkamau.justjava.utils
+
+import org.junit.Assert
+import org.junit.Test
+
+class PhoneNumberUtilsKtTest {
+    @Test
+    fun `starts with zero`() {
+        val number = "0712345678"
+        val sanitized = PhoneNumberUtils.sanitize(number)
+        Assert.assertEquals("254712345678", sanitized)
+    }
+
+    @Test
+    fun `starts with plus`() {
+        val number = "+254712345678"
+        val sanitized = PhoneNumberUtils.sanitize(number)
+        Assert.assertEquals("254712345678", sanitized)
+    }
+
+    @Test
+    fun `can beautify`() {
+        val number = "254712345678"
+        val pretty = PhoneNumberUtils.beautify(number)
+        Assert.assertEquals("+254 712 345 678", pretty)
+    }
+}