CB-11043: Android App crashes while trying to save contact with phone…

… numbers array with deleted values This closes #121
apache · Apr 12, 2016 · d7dd937 · d7dd937
1 parent 0f8945b
commit d7dd937
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -369,7 +369,6 @@ for details.
     myContact.save(function (contact_obj) {
         var contactObjToModify = contact_obj.clone();
         contact_obj.remove(function(){
-            // Note: Do NOT use delete operator to remove the phone numbers. It will break in android.
             var phoneNumbers = [contactObjToModify.phoneNumbers[0]];
             contactObjToModify.phoneNumbers = phoneNumbers;
             contactObjToModify.save(function(c_obj){

diff --git a/src/android/ContactAccessorSdk5.java b/src/android/ContactAccessorSdk5.java
@@ -1701,8 +1701,10 @@ private String createNewContact(JSONObject contact, String accountType, String a
             phones = contact.getJSONArray("phoneNumbers");
             if (phones != null) {
                 for (int i = 0; i < phones.length(); i++) {
-                    JSONObject phone = (JSONObject) phones.get(i);
-                    insertPhone(ops, phone);
+                    if(!phones.isNull(i)){
+                        JSONObject phone = (JSONObject) phones.get(i);
+                        insertPhone(ops, phone);
+                    }
                 }
             }
         } catch (JSONException e) {