commit 366824d00030e6a0a0db5a0cc44f1ab7ac672303
author Ben Murdoch <benm@google.com> Tue Jan 18 19:42:08 2011 +0000
committer Ben Murdoch <benm@google.com> Wed Jan 19 10:29:25 2011 +0000
tree f9a725445a908936923d873273e1a654bef77387
parent 4c1c0feb85129e9c6cd7daee0071dd90151a0eb9

Strip phone number punctuation when validating for autofill

Strip out any phone number separator characters when calculating
the length of the phone number for validation in the autofill
profile editor.

Change-Id: Ic5f9792a8da8d0d1914b1cdd831a018c64d12ace

src/com/android/browser/AutoFillSettingsFragment.java

diff --git a/src/com/android/browser/AutoFillSettingsFragment.java b/src/com/android/browser/AutoFillSettingsFragment.java
index 389be1f..3a7ae12 100644
--- a/src/com/android/browser/AutoFillSettingsFragment.java
+++ b/src/com/android/browser/AutoFillSettingsFragment.java
@@ -65,11 +65,18 @@
     private class PhoneNumberValidator implements TextWatcher {
         // Keep in sync with kPhoneNumberLength in chrome/browser/autofill/phone_number.cc
         private static final int PHONE_NUMBER_LENGTH = 7;
+        private static final String PHONE_NUMBER_SEPARATORS_REGEX = "[\\s\\.\\(\\)-]";
 
         public void afterTextChanged(Editable s) {
-            int phoneNumberLength = s.toString().length();
+            String phoneNumber = s.toString();
+            int phoneNumberLength = phoneNumber.length();
 
-            if (phoneNumberLength > 0 && phoneNumberLength < PHONE_NUMBER_LENGTH) {
+            // Strip out any phone number separators.
+            phoneNumber = phoneNumber.replaceAll(PHONE_NUMBER_SEPARATORS_REGEX, "");
+
+            int strippedPhoneNumberLength = phoneNumber.length();
+
+            if (phoneNumberLength > 0 && strippedPhoneNumberLength < PHONE_NUMBER_LENGTH) {
                 mPhoneEdit.setError(getResources().getText(
                         R.string.autofill_profile_editor_phone_number_invalid));
             } else {