cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alsoro...@apache.org
Subject cordova-plugin-contacts git commit: CB-11028 android: Allow to set custom labels for contacts' fields
Date Wed, 02 Nov 2016 14:35:33 GMT
Repository: cordova-plugin-contacts
Updated Branches:
  refs/heads/master a19baba6f -> 76f695ef9


CB-11028 android: Allow to set custom labels for contacts' fields


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/commit/76f695ef
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/tree/76f695ef
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/diff/76f695ef

Branch: refs/heads/master
Commit: 76f695ef9d151638c80d13ac1b4e2cbc9a781589
Parents: a19baba
Author: Nikita Matrosov <matrosov.nikita94@gmail.com>
Authored: Wed Nov 2 13:11:39 2016 +0300
Committer: Nikita Matrosov <matrosov.nikita94@gmail.com>
Committed: Wed Nov 2 13:14:05 2016 +0300

----------------------------------------------------------------------
 src/android/ContactAccessorSdk5.java | 63 +++++++++++++++++++++++--------
 tests/tests.js                       | 44 +++++++++++++++++++++
 2 files changed, 92 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/76f695ef/src/android/ContactAccessorSdk5.java
----------------------------------------------------------------------
diff --git a/src/android/ContactAccessorSdk5.java b/src/android/ContactAccessorSdk5.java
index 8f7135e..d2829d5 100644
--- a/src/android/ContactAccessorSdk5.java
+++ b/src/android/ContactAccessorSdk5.java
@@ -54,6 +54,11 @@ import android.os.RemoteException;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.Organization;
+import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.Website;
+import android.provider.ContactsContract.CommonDataKinds.Im;
 import android.text.TextUtils;
 
 /**
@@ -772,10 +777,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     */
     private JSONObject organizationQuery(Cursor cursor) {
         JSONObject organization = new JSONObject();
+        int typeCode = cursor.getInt(cursor.getColumnIndex(Organization.TYPE));
+        String typeLabel = cursor.getString(cursor.getColumnIndex(Organization.LABEL));
+        String type = (typeCode == Organization.TYPE_CUSTOM) ? typeLabel : getOrgType(typeCode);
         try {
             organization.put("id", cursor.getString(cursor.getColumnIndex(CommonDataKinds.Organization._ID)));
             organization.put("pref", false); // Android does not store pref attribute
-            organization.put("type", getOrgType(cursor.getInt(cursor.getColumnIndex(CommonDataKinds.Organization.TYPE))));
+            organization.put("type", type);
             organization.put("department", cursor.getString(cursor.getColumnIndex(CommonDataKinds.Organization.DEPARTMENT)));
             organization.put("name", cursor.getString(cursor.getColumnIndex(CommonDataKinds.Organization.COMPANY)));
             organization.put("title", cursor.getString(cursor.getColumnIndex(CommonDataKinds.Organization.TITLE)));
@@ -792,10 +800,13 @@ public class ContactAccessorSdk5 extends ContactAccessor {
      */
     private JSONObject addressQuery(Cursor cursor) {
         JSONObject address = new JSONObject();
+        int typeCode = cursor.getInt(cursor.getColumnIndex(StructuredPostal.TYPE));
+        String typeLabel = cursor.getString(cursor.getColumnIndex(StructuredPostal.LABEL));
+        String type = (typeCode == StructuredPostal.TYPE_CUSTOM) ? typeLabel : getAddressType(typeCode);
         try {
             address.put("id", cursor.getString(cursor.getColumnIndex(CommonDataKinds.StructuredPostal._ID)));
             address.put("pref", false); // Android does not store pref attribute
-            address.put("type", getAddressType(cursor.getInt(cursor.getColumnIndex(CommonDataKinds.Organization.TYPE))));
+            address.put("type", type);
             address.put("formatted", cursor.getString(cursor.getColumnIndex(CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS)));
             address.put("streetAddress", cursor.getString(cursor.getColumnIndex(CommonDataKinds.StructuredPostal.STREET)));
             address.put("locality", cursor.getString(cursor.getColumnIndex(CommonDataKinds.StructuredPostal.CITY)));
@@ -862,11 +873,14 @@ public class ContactAccessorSdk5 extends ContactAccessor {
      */
     private JSONObject phoneQuery(Cursor cursor) {
         JSONObject phoneNumber = new JSONObject();
+        int typeCode = cursor.getInt(cursor.getColumnIndex(Phone.TYPE));
+        String typeLabel = cursor.getString(cursor.getColumnIndex(Phone.LABEL));
+        String type = (typeCode == Phone.TYPE_CUSTOM) ? typeLabel : getPhoneType(typeCode);
         try {
             phoneNumber.put("id", cursor.getString(cursor.getColumnIndex(CommonDataKinds.Phone._ID)));
             phoneNumber.put("pref", false); // Android does not store pref attribute
             phoneNumber.put("value", cursor.getString(cursor.getColumnIndex(CommonDataKinds.Phone.NUMBER)));
-            phoneNumber.put("type", getPhoneType(cursor.getInt(cursor.getColumnIndex(CommonDataKinds.Phone.TYPE))));
+            phoneNumber.put("type",type);
         } catch (JSONException e) {
             LOG.e(LOG_TAG, e.getMessage(), e);
         } catch (Exception excp) {
@@ -882,11 +896,14 @@ public class ContactAccessorSdk5 extends ContactAccessor {
      */
     private JSONObject emailQuery(Cursor cursor) {
         JSONObject email = new JSONObject();
+        int typeCode = cursor.getInt(cursor.getColumnIndex(Email.TYPE));
+        String typeLabel = cursor.getString(cursor.getColumnIndex(Email.LABEL));
+        String type = (typeCode == Email.TYPE_CUSTOM) ? typeLabel : getContactType(typeCode);
         try {
             email.put("id", cursor.getString(cursor.getColumnIndex(CommonDataKinds.Email._ID)));
             email.put("pref", false); // Android does not store pref attribute
             email.put("value", cursor.getString(cursor.getColumnIndex(CommonDataKinds.Email.DATA)));
-            email.put("type", getContactType(cursor.getInt(cursor.getColumnIndex(CommonDataKinds.Email.TYPE))));
+            email.put("type", type);
         } catch (JSONException e) {
             LOG.e(LOG_TAG, e.getMessage(), e);
         }
@@ -926,11 +943,14 @@ public class ContactAccessorSdk5 extends ContactAccessor {
      */
     private JSONObject websiteQuery(Cursor cursor) {
         JSONObject website = new JSONObject();
+        int typeCode = cursor.getInt(cursor.getColumnIndex(Website.TYPE));
+        String typeLabel = cursor.getString(cursor.getColumnIndex(Website.LABEL));
+        String type = (typeCode == Website.TYPE_CUSTOM) ? typeLabel : getContactType(typeCode);
         try {
             website.put("id", cursor.getString(cursor.getColumnIndex(CommonDataKinds.Website._ID)));
             website.put("pref", false); // Android does not store pref attribute
             website.put("value", cursor.getString(cursor.getColumnIndex(CommonDataKinds.Website.URL)));
-            website.put("type", getContactType(cursor.getInt(cursor.getColumnIndex(CommonDataKinds.Website.TYPE))));
+            website.put("type", type);
         } catch (JSONException e) {
             LOG.e(LOG_TAG, e.getMessage(), e);
         }
@@ -1116,6 +1136,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                             contentValues.put(ContactsContract.Data.MIMETYPE, CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
                             contentValues.put(CommonDataKinds.Phone.NUMBER, getJsonString(phone,
"value"));
                             contentValues.put(CommonDataKinds.Phone.TYPE, getPhoneType(getJsonString(phone,
"type")));
+                            contentValues.put(CommonDataKinds.Phone.LABEL, getJsonString(phone,
"type"));
 
                             ops.add(ContentProviderOperation.newInsert(
                                     ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());
@@ -1128,6 +1149,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                                             new String[] { phoneId, CommonDataKinds.Phone.CONTENT_ITEM_TYPE
})
                                     .withValue(CommonDataKinds.Phone.NUMBER, getJsonString(phone,
"value"))
                                     .withValue(CommonDataKinds.Phone.TYPE, getPhoneType(getJsonString(phone,
"type")))
+                                    .withValue(CommonDataKinds.Phone.LABEL, getJsonString(phone,
"type"))
                                     .build());
                         }
                     }
@@ -1162,7 +1184,8 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                             contentValues.put(ContactsContract.Data.MIMETYPE, CommonDataKinds.Email.CONTENT_ITEM_TYPE);
                             contentValues.put(CommonDataKinds.Email.DATA, getJsonString(email,
"value"));
                             contentValues.put(CommonDataKinds.Email.TYPE, getContactType(getJsonString(email,
"type")));
-
+                            contentValues.put(CommonDataKinds.Email.LABEL, getJsonString(email,
"type"));
+                            
                             ops.add(ContentProviderOperation.newInsert(
                                     ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());
                         }
@@ -1176,6 +1199,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                                             new String[] { emailId, CommonDataKinds.Email.CONTENT_ITEM_TYPE
})
                                     .withValue(CommonDataKinds.Email.DATA, getJsonString(email,
"value"))
                                     .withValue(CommonDataKinds.Email.TYPE, getContactType(getJsonString(email,
"type")))
+                                    .withValue(CommonDataKinds.Email.LABEL, getJsonString(email,
"type"))
                                     .build());
                          } else {
                                 ops.add(ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI)
@@ -1216,6 +1240,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                             contentValues.put(ContactsContract.Data.RAW_CONTACT_ID, rawId);
                             contentValues.put(ContactsContract.Data.MIMETYPE, CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE);
                             contentValues.put(CommonDataKinds.StructuredPostal.TYPE, getAddressType(getJsonString(address,
"type")));
+                            contentValues.put(CommonDataKinds.StructuredPostal.LABEL, getJsonString(address,
"type"));
                             contentValues.put(CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS,
getJsonString(address, "formatted"));
                             contentValues.put(CommonDataKinds.StructuredPostal.STREET, getJsonString(address,
"streetAddress"));
                             contentValues.put(CommonDataKinds.StructuredPostal.CITY, getJsonString(address,
"locality"));
@@ -1233,6 +1258,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                                             ContactsContract.Data.MIMETYPE + "=?",
                                             new String[] { addressId, CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE
})
                                     .withValue(CommonDataKinds.StructuredPostal.TYPE, getAddressType(getJsonString(address,
"type")))
+                                    .withValue(CommonDataKinds.StructuredPostal.LABEL, getJsonString(address,
"type"))
                                     .withValue(CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS,
getJsonString(address, "formatted"))
                                     .withValue(CommonDataKinds.StructuredPostal.STREET, getJsonString(address,
"streetAddress"))
                                     .withValue(CommonDataKinds.StructuredPostal.CITY, getJsonString(address,
"locality"))
@@ -1272,6 +1298,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                             contentValues.put(ContactsContract.Data.RAW_CONTACT_ID, rawId);
                             contentValues.put(ContactsContract.Data.MIMETYPE, CommonDataKinds.Organization.CONTENT_ITEM_TYPE);
                             contentValues.put(CommonDataKinds.Organization.TYPE, getOrgType(getJsonString(org,
"type")));
+                            contentValues.put(CommonDataKinds.Organization.LABEL, getJsonString(org,
"type"));
                             contentValues.put(CommonDataKinds.Organization.DEPARTMENT, getJsonString(org,
"department"));
                             contentValues.put(CommonDataKinds.Organization.COMPANY, getJsonString(org,
"name"));
                             contentValues.put(CommonDataKinds.Organization.TITLE, getJsonString(org,
"title"));
@@ -1286,6 +1313,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                                             ContactsContract.Data.MIMETYPE + "=?",
                                             new String[] { orgId, CommonDataKinds.Organization.CONTENT_ITEM_TYPE
})
                                     .withValue(CommonDataKinds.Organization.TYPE, getOrgType(getJsonString(org,
"type")))
+                                    .withValue(CommonDataKinds.Organization.LABEL, getJsonString(org,
"type"))
                                     .withValue(CommonDataKinds.Organization.DEPARTMENT, getJsonString(org,
"department"))
                                     .withValue(CommonDataKinds.Organization.COMPANY, getJsonString(org,
"name"))
                                     .withValue(CommonDataKinds.Organization.TITLE, getJsonString(org,
"title"))
@@ -1323,6 +1351,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                             contentValues.put(ContactsContract.Data.MIMETYPE, CommonDataKinds.Im.CONTENT_ITEM_TYPE);
                             contentValues.put(CommonDataKinds.Im.DATA, getJsonString(im,
"value"));
                             contentValues.put(CommonDataKinds.Im.TYPE, getImType(getJsonString(im,
"type")));
+                            contentValues.put(CommonDataKinds.Im.CUSTOM_PROTOCOL, getJsonString(im,
"type"));
 
                             ops.add(ContentProviderOperation.newInsert(
                                     ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());
@@ -1335,6 +1364,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                                             new String[] { imId, CommonDataKinds.Im.CONTENT_ITEM_TYPE
})
                                     .withValue(CommonDataKinds.Im.DATA, getJsonString(im,
"value"))
                                     .withValue(CommonDataKinds.Im.TYPE, getContactType(getJsonString(im,
"type")))
+                                    .withValue(CommonDataKinds.Im.CUSTOM_PROTOCOL, getJsonString(im,
"type"))
                                     .build());
                         }
                     }
@@ -1390,6 +1420,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                             contentValues.put(ContactsContract.Data.MIMETYPE, CommonDataKinds.Website.CONTENT_ITEM_TYPE);
                             contentValues.put(CommonDataKinds.Website.DATA, getJsonString(website,
"value"));
                             contentValues.put(CommonDataKinds.Website.TYPE, getContactType(getJsonString(website,
"type")));
+                            contentValues.put(CommonDataKinds.Website.LABEL, getJsonString(website,
"type"));
 
                             ops.add(ContentProviderOperation.newInsert(
                                     ContactsContract.Data.CONTENT_URI).withValues(contentValues).build());
@@ -1402,6 +1433,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                                             new String[] { websiteId, CommonDataKinds.Website.CONTENT_ITEM_TYPE
})
                                     .withValue(CommonDataKinds.Website.DATA, getJsonString(website,
"value"))
                                     .withValue(CommonDataKinds.Website.TYPE, getContactType(getJsonString(website,
"type")))
+                                    .withValue(CommonDataKinds.Website.LABEL, getJsonString(website,
"type"))
                                     .build());
                         }
                     }
@@ -1505,6 +1537,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 .withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Website.CONTENT_ITEM_TYPE)
                 .withValue(CommonDataKinds.Website.DATA, getJsonString(website, "value"))
                 .withValue(CommonDataKinds.Website.TYPE, getContactType(getJsonString(website,
"type")))
+                .withValue(CommonDataKinds.Website.LABEL, getJsonString(website, "type"))
                 .build());
     }
 
@@ -1520,6 +1553,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 .withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Im.CONTENT_ITEM_TYPE)
                 .withValue(CommonDataKinds.Im.DATA, getJsonString(im, "value"))
                 .withValue(CommonDataKinds.Im.PROTOCOL, getImType(getJsonString(im, "type")))
+                .withValue(CommonDataKinds.Im.CUSTOM_PROTOCOL, getJsonString(im, "type"))
                 .build());
     }
 
@@ -1538,6 +1572,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 .withValue(CommonDataKinds.Organization.DEPARTMENT, getJsonString(org, "department"))
                 .withValue(CommonDataKinds.Organization.COMPANY, getJsonString(org, "name"))
                 .withValue(CommonDataKinds.Organization.TITLE, getJsonString(org, "title"))
+                .withValue(CommonDataKinds.Organization.LABEL, getJsonString(org, "type"))
                 .build());
     }
 
@@ -1559,6 +1594,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 .withValue(CommonDataKinds.StructuredPostal.REGION, getJsonString(address,
"region"))
                 .withValue(CommonDataKinds.StructuredPostal.POSTCODE, getJsonString(address,
"postalCode"))
                 .withValue(CommonDataKinds.StructuredPostal.COUNTRY, getJsonString(address,
"country"))
+                .withValue(CommonDataKinds.StructuredPostal.LABEL, getJsonString(address,
"type"))
                 .build());
     }
 
@@ -1575,6 +1611,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 .withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Email.CONTENT_ITEM_TYPE)
                 .withValue(CommonDataKinds.Email.DATA, getJsonString(email, "value"))
                 .withValue(CommonDataKinds.Email.TYPE, getContactType(getJsonString(email,
"type")))
+                .withValue(CommonDataKinds.Email.LABEL, getJsonString(email, "type"))
                 .build());
     }
 
@@ -1591,6 +1628,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
                 .withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Phone.CONTENT_ITEM_TYPE)
                 .withValue(CommonDataKinds.Phone.NUMBER, getJsonString(phone, "value"))
                 .withValue(CommonDataKinds.Phone.TYPE, getPhoneType(getJsonString(phone,
"type")))
+                .withValue(Phone.LABEL, getJsonString(phone, "type"))
                 .build());
     }
 
@@ -1986,9 +2024,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
             else if ("tty ttd".equals(lowerType)) {
                 return Phone.TYPE_TTY_TDD;
             }
-            else if ("custom".equals(lowerType)) {
-                return Phone.TYPE_CUSTOM;
-            }
+            return Phone.TYPE_CUSTOM;
         }
         return type;
     }
@@ -2090,9 +2126,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
             else if ("mobile".equals(lowerType)) {
                 return CommonDataKinds.Email.TYPE_MOBILE;
             }
-            else if ("custom".equals(lowerType)) {
-                return CommonDataKinds.Email.TYPE_CUSTOM;
-            }
+            return CommonDataKinds.Email.TYPE_CUSTOM;
         }
         return type;
     }
@@ -2140,9 +2174,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
             else if ("other".equals(lowerType)) {
                 return CommonDataKinds.Organization.TYPE_OTHER;
             }
-            else if ("custom".equals(lowerType)) {
-                return CommonDataKinds.Organization.TYPE_CUSTOM;
-            }
+            return CommonDataKinds.Organization.TYPE_CUSTOM;
         }
         return type;
     }
@@ -2188,6 +2220,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
             else if ("home".equals(lowerType)) {
                 return CommonDataKinds.StructuredPostal.TYPE_HOME;
             }
+            return CommonDataKinds.StructuredPostal.TYPE_CUSTOM;
         }
         return type;
     }

http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/76f695ef/tests/tests.js
----------------------------------------------------------------------
diff --git a/tests/tests.js b/tests/tests.js
index 6d0ef54..8388a93 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -302,6 +302,50 @@ exports.defineAutoTests = function() {
                     };
                     specContext.contactObj.save(onSuccessSave, fail.bind(null, done));
                 });
+
+                it("contacts.spec.7.3 should contain custom label in type", function(done)
{
+                    if (isWindows || isWindowsPhone8 || isIOSPermissionBlocked) {
+                        pending();
+                    }
+                    var testDisplayName = "testContact";
+                    var customLabel = "myType";
+                    var testContactDetail = new ContactField(customLabel, "a", true);
+                    var contactFields = ["phoneNumbers", "emails", "urls", "ims"];
+                    var specContext = this;
+
+                    specContext.contactObj = new Contact();
+                    specContext.contactObj.nickname = testDisplayName;
+                    specContext.contactObj.displayName = testDisplayName;
+                    contactFields.forEach(function(contactField) {
+                        specContext.contactObj[contactField] = [];
+                        specContext.contactObj[contactField][0] = testContactDetail;
+                    });
+                    specContext.contactObj.addresses = [];
+                    specContext.contactObj.addresses[0]  = new ContactAddress(true, customLabel,
"a", "b", "c", "d", "e", "f");
+                    var checkTypes = function(contact) {
+                        var allFieldsWithCustomLabel = contactFields.concat(["addresses"]);
+                        return allFieldsWithCustomLabel.every(function(contactField) {
+                            return contact[contactField] && contact[contactField][0].type
=== customLabel;
+                        });
+                    };
+                    var win = function(contactResult) {
+                        expect(contactResult.length > 0).toBe(true);
+                        var typesCustomized = contactResult.every(function(contact) {
+                            return checkTypes(contact);
+                        });
+                        expect(typesCustomized).toBe(true);
+                        done();
+                    };
+                    var onSuccessSave = function(savedContact) {
+                        expect(checkTypes(savedContact)).toBe(true);
+                        specContext.contactObj = savedContact;
+                        var options = new ContactFindOptions();
+                        options.filter = testDisplayName;
+                        options.multiple = true;
+                        navigator.contacts.find(["displayName", "nickname"], win, fail.bind(null,
done), options);
+                    };
+                    specContext.contactObj.save(onSuccessSave, fail.bind(null, done));
+                });
             });
         });
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message