Merge "ContactsCommon: Change the separator of anr to "&""

5 files changed, 27 insertions, 16 deletions

diff --git a/src/com/android/contacts/common/MoreContactUtils.java b/src/com/android/contacts/common/MoreContactUtils.java
index d569a194..7c62e43d 100755
--- a/src/com/android/contacts/common/MoreContactUtils.java
+++ b/src/com/android/contacts/common/MoreContactUtils.java
@@ -504,7 +504,7 @@ public class MoreContactUtils {
             emailAddressArray = null;
         }
         if (!TextUtils.isEmpty(anrs)) {
-            anrArray = anrs.split(",");
+            anrArray = anrs.split(SimContactsConstants.ANR_SEP);
         } else {
             anrArray = null;
         }
@@ -614,7 +614,7 @@ public class MoreContactUtils {
             mValues.put(SimContactsConstants.STR_EMAILS, emails);
         }
         if (!TextUtils.isEmpty(anrNumber)) {
-            anrNumber = PhoneNumberUtils.stripSeparators(anrNumber);
+            anrNumber = anrNumber.replaceAll("[^0123456789PWN\\,\\;\\*\\#\\+\\&]", "");
             mValues.put(SimContactsConstants.STR_ANRS, anrNumber);
         }
 
diff --git a/src/com/android/contacts/common/SimContactsConstants.java b/src/com/android/contacts/common/SimContactsConstants.java
index 759dcd9e..3a0dc0f3 100644
--- a/src/com/android/contacts/common/SimContactsConstants.java
+++ b/src/com/android/contacts/common/SimContactsConstants.java
@@ -55,6 +55,8 @@ public interface SimContactsConstants {
     public static final String STR_NEW_ANRS = "newAnrs";
     public static final String INTENT_EXPORT_COMPLETE =
         "com.android.sim.INTENT_EXPORT_COMPLETE";
+    public static final String ANR_SEP = "&";
+    public static final String EMAIL_SEP = ",";
     public static final String SIM_URI = "content://icc/adn";
     public static final String SIM_SUB_URI = "content://icc/adn/subId/";
     public static final String WITHOUT_SIM_FLAG ="no_sim";
diff --git a/src/com/android/contacts/common/SimContactsOperation.java b/src/com/android/contacts/common/SimContactsOperation.java
index 55c7b79f..493327e6 100644
--- a/src/com/android/contacts/common/SimContactsOperation.java
+++ b/src/com/android/contacts/common/SimContactsOperation.java
@@ -94,9 +94,12 @@ public class SimContactsOperation {
         Uri uri = getContentUri(subscription);
         String number = values.getAsString(SimContactsConstants.STR_NUMBER);
         String anrs = values.getAsString(SimContactsConstants.STR_ANRS);
+        if (!TextUtils.isEmpty(anrs)) {
+            anrs = anrs.replaceAll("[^0123456789PWN\\,\\;\\*\\#\\+\\&]", "");
+        }
         String emails = values.getAsString(SimContactsConstants.STR_EMAILS);
         values.put(SimContactsConstants.STR_NUMBER,PhoneNumberUtils.stripSeparators(number));
-        values.put(SimContactsConstants.STR_ANRS,PhoneNumberUtils.stripSeparators(anrs));
+        values.put(SimContactsConstants.STR_ANRS,anrs);
         values.put(SimContactsConstants.STR_EMAILS,emails);
 
         Uri resultUri;
@@ -114,8 +117,14 @@ public class SimContactsOperation {
         String newAnrs = values.getAsString(SimContactsConstants.STR_NEW_ANRS);
         values.put(SimContactsConstants.STR_NUMBER,PhoneNumberUtils.stripSeparators(oldNumber));
         values.put(SimContactsConstants.STR_NEW_NUMBER,PhoneNumberUtils.stripSeparators(newNumber));
-        values.put(SimContactsConstants.STR_ANRS,PhoneNumberUtils.stripSeparators(oldAnrs));
-        values.put(SimContactsConstants.STR_NEW_ANRS,PhoneNumberUtils.stripSeparators(newAnrs));
+        if (!TextUtils.isEmpty(oldAnrs)) {
+            oldAnrs = oldAnrs.replaceAll("[^0123456789PWN\\,\\;\\*\\#\\+\\&]", "");
+        }
+        if (!TextUtils.isEmpty(newAnrs)) {
+            newAnrs = newAnrs.replaceAll("[^0123456789PWN\\,\\;\\*\\#\\+\\&]", "");
+        }
+        values.put(SimContactsConstants.STR_ANRS,oldAnrs);
+        values.put(SimContactsConstants.STR_NEW_ANRS,newAnrs);
 
         result = mResolver.update(uri,values,null,null);
         return result;
@@ -133,7 +142,7 @@ public class SimContactsOperation {
         if (number != null)
             num = PhoneNumberUtils.stripSeparators(number);
         if (anrs != null)
-            anrs = PhoneNumberUtils.stripSeparators(anrs);
+            anrs = anrs.replaceAll("[^0123456789PWN\\,\\;\\*\\#\\+\\&]", "");
         Uri uri = getContentUri(subscription);
 
 
@@ -278,7 +287,7 @@ public class SimContactsOperation {
 
             while (c.moveToNext()) {
                 if (!TextUtils.isEmpty(retval.toString())) {
-                    retval.append(",");
+                    retval.append(SimContactsConstants.EMAIL_SEP);
                 }
                 retval.append(c.getString(c.getColumnIndex(columnName)));
             }
@@ -316,7 +325,7 @@ public class SimContactsOperation {
 
             while (c.moveToNext()) {
                 if (!TextUtils.isEmpty(retval.toString())) {
-                    retval.append(",");
+                    retval.append(SimContactsConstants.ANR_SEP);
                 }
                 retval.append(c.getString(c.getColumnIndex(columnName)));
             }
diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
index 40603e90..8cc339cd 100755
--- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
+++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
@@ -543,7 +543,7 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment
                                                         MoreContactUtils.MAX_LENGTH_NUMBER_IN_SIM);
                                             }
                                             anrNum.append(s);
-                                            anrNum.append(",");
+                                            anrNum.append(SimContactsConstants.ANR_SEP);
                                         }
                                     }
                                 }
@@ -557,7 +557,7 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment
                                                         MoreContactUtils.MAX_LENGTH_EMAIL_IN_SIM);
                                             }
                                             email.append(s);
-                                            email.append(",");
+                                            email.append(SimContactsConstants.EMAIL_SEP);
                                         }
                                     }
                                 }
diff --git a/src/com/android/contacts/common/model/RawContactDelta.java b/src/com/android/contacts/common/model/RawContactDelta.java
index cf5bf304..435e3442 100644
--- a/src/com/android/contacts/common/model/RawContactDelta.java
+++ b/src/com/android/contacts/common/model/RawContactDelta.java
@@ -481,7 +481,7 @@ public class RawContactDelta implements Parcelable {
                         }
                     } else {
                         anr.append(valuesDelta.getAfter().getAsString(Phone.NUMBER));
-                        anr.append(",");
+                        anr.append(SimContactsConstants.ANR_SEP);
                     }
                 }
             }
@@ -493,7 +493,7 @@ public class RawContactDelta implements Parcelable {
                         number = valuesDelta.getBefore().getAsString(Phone.NUMBER);
                     } else {
                         anr.append(valuesDelta.getBefore().getAsString(Phone.NUMBER));
-                        anr.append(",");
+                        anr.append(SimContactsConstants.ANR_SEP);
                     }
                 }
                 if (valuesDelta.getAfter() != null
@@ -506,7 +506,7 @@ public class RawContactDelta implements Parcelable {
                         }
                     } else {
                         newAnr.append(valuesDelta.getAfter().getAsString(Phone.NUMBER));
-                        newAnr.append(",");
+                        newAnr.append(SimContactsConstants.ANR_SEP);
                     }
                 }
             }
@@ -517,7 +517,7 @@ public class RawContactDelta implements Parcelable {
                 if (valuesDelta.getAfter() != null
                         && valuesDelta.getAfter().size() != 0) {
                     email.append(valuesDelta.getAfter().getAsString(Email.DATA));
-                    email.append(",");
+                    email.append(SimContactsConstants.EMAIL_SEP);
                 }
             }
         } else if (emails != null) {
@@ -525,12 +525,12 @@ public class RawContactDelta implements Parcelable {
                 if (valuesDelta.getBefore() != null
                         && valuesDelta.getBefore().size() != 0) {
                     email.append(valuesDelta.getBefore().getAsString(Email.DATA));
-                    email.append(",");
+                    email.append(SimContactsConstants.EMAIL_SEP);
                 }
                 if (valuesDelta.getAfter() != null
                         && valuesDelta.getAfter().size() != 0) {
                         newEmail.append(valuesDelta.getAfter().getAsString(Email.DATA));
-                        newEmail.append(",");
+                        newEmail.append(SimContactsConstants.EMAIL_SEP);
                 }
             }
         }