diff --git a/framework/assets/js/contact.js b/framework/assets/js/contact.js index 3124c640..a0ddf8a0 100755 --- a/framework/assets/js/contact.js +++ b/framework/assets/js/contact.js @@ -21,17 +21,14 @@ PhoneGap.addResource("contact"); * @param {Array.} addresses array of addresses * @param {Array.} ims instant messaging user ids * @param {Array.} organizations -* @param {DOMString} revision date contact was last updated * @param {DOMString} birthday contact's birthday -* @param {DOMString} gender contact's gender * @param {DOMString} note user notes about contact * @param {Array.} photos * @param {Array.} categories * @param {Array.} urls contact's web sites -* @param {DOMString} timezone the contacts time zone */ var Contact = function (id, displayName, name, nickname, phoneNumbers, emails, addresses, - ims, organizations, revision, birthday, gender, note, photos, categories, urls, timezone) { + ims, organizations, birthday, note, photos, categories, urls) { this.id = id || null; this.rawId = null; this.displayName = displayName || null; @@ -42,14 +39,11 @@ var Contact = function (id, displayName, name, nickname, phoneNumbers, emails, a this.addresses = addresses || null; // ContactAddress[] this.ims = ims || null; // ContactField[] this.organizations = organizations || null; // ContactOrganization[] - this.revision = revision || null; this.birthday = birthday || null; - this.gender = gender || null; this.note = note || null; this.photos = photos || null; // ContactField[] this.categories = categories || null; // ContactField[] this.urls = urls || null; // ContactField[] - this.timezone = timezone || null; }; /** @@ -66,11 +60,10 @@ var ContactError = function() { */ ContactError.UNKNOWN_ERROR = 0; ContactError.INVALID_ARGUMENT_ERROR = 1; -ContactError.NOT_FOUND_ERROR = 2; -ContactError.TIMEOUT_ERROR = 3; -ContactError.PENDING_OPERATION_ERROR = 4; -ContactError.IO_ERROR = 5; -ContactError.NOT_SUPPORTED_ERROR = 6; +ContactError.TIMEOUT_ERROR = 2; +ContactError.PENDING_OPERATION_ERROR = 3; +ContactError.IO_ERROR = 4; +ContactError.NOT_SUPPORTED_ERROR = 5; ContactError.PERMISSION_DENIED_ERROR = 20; /** @@ -81,7 +74,7 @@ ContactError.PERMISSION_DENIED_ERROR = 20; Contact.prototype.remove = function(successCB, errorCB) { if (this.id === null) { var errorObj = new ContactError(); - errorObj.code = ContactError.NOT_FOUND_ERROR; + errorObj.code = ContactError.UNKNOWN_ERROR; errorCB(errorObj); } else { @@ -197,8 +190,10 @@ var ContactField = function(type, value, pref) { * @param postalCode * @param country */ -var ContactAddress = function(formatted, streetAddress, locality, region, postalCode, country) { +var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country) { this.id = null; + this.pref = pref || null; + this.type = type || null; this.formatted = formatted || null; this.streetAddress = streetAddress || null; this.locality = locality || null; @@ -219,8 +214,10 @@ var ContactAddress = function(formatted, streetAddress, locality, region, postal * @param location * @param desc */ -var ContactOrganization = function(name, dept, title) { +var ContactOrganization = function(pref, type, name, dept, title) { this.id = null; + this.pref = pref || null; + this.type = type || null; this.name = name || null; this.department = dept || null; this.title = title || null; @@ -243,7 +240,16 @@ var Contacts = function() { * @return array of Contacts matching search criteria */ Contacts.prototype.find = function(fields, successCB, errorCB, options) { - PhoneGap.exec(successCB, errorCB, "Contacts", "search", [fields, options]); + if (successCB === null) { + throw new TypeError("You must specify a success callback for the find command."); + } + if (fields === null || fields === "undefined" || fields.length === "undefined" || fields.length <= 0) { + if (typeof errorCB === "function") { + errorCB({"code": ContactError.INVALID_ARGUMENT_ERROR}); + } + } else { + PhoneGap.exec(successCB, errorCB, "Contacts", "search", [fields, options]); + } }; /** @@ -267,7 +273,7 @@ Contacts.prototype.create = function(properties) { /** * This function returns and array of contacts. It is required as we need to convert raw * JSON objects into concrete Contact objects. Currently this method is called after -* navigator.service.contacts.find but before the find methods success call back. +* navigator.contacts.find but before the find methods success call back. * * @param jsonArray an array of JSON Objects that need to be converted to Contact objects. * @returns an array of Contact objects @@ -276,7 +282,7 @@ Contacts.prototype.cast = function(pluginResult) { var contacts = []; var i; for (i=0; i 0) ? true : false; } + + @Override + public JSONObject getContactById(String id) throws JSONException { + // TODO Auto-generated method stub + return null; + } } \ No newline at end of file diff --git a/framework/src/com/phonegap/ContactAccessorSdk5.java b/framework/src/com/phonegap/ContactAccessorSdk5.java index 6da82bc3..bcb25227 100644 --- a/framework/src/com/phonegap/ContactAccessorSdk5.java +++ b/framework/src/com/phonegap/ContactAccessorSdk5.java @@ -46,6 +46,7 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.app.Activity; import android.content.ContentProviderOperation; +import android.content.ContentProviderResult; import android.content.ContentUris; import android.content.ContentValues; import android.content.OperationApplicationException; @@ -88,7 +89,7 @@ public class ContactAccessorSdk5 extends ContactAccessor { */ private static final Map dbMap = new HashMap(); static { - dbMap.put("id", ContactsContract.Contacts._ID); + dbMap.put("id", ContactsContract.Data.CONTACT_ID); dbMap.put("displayName", ContactsContract.Contacts.DISPLAY_NAME); dbMap.put("name", ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME); dbMap.put("name.formatted", ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME); @@ -115,14 +116,12 @@ public class ContactAccessorSdk5 extends ContactAccessor { dbMap.put("organizations.name", ContactsContract.CommonDataKinds.Organization.COMPANY); dbMap.put("organizations.department", ContactsContract.CommonDataKinds.Organization.DEPARTMENT); dbMap.put("organizations.title", ContactsContract.CommonDataKinds.Organization.TITLE); - //dbMap.put("revision", null); dbMap.put("birthday", ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE); dbMap.put("note", ContactsContract.CommonDataKinds.Note.NOTE); dbMap.put("photos.value", ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE); //dbMap.put("categories.value", null); dbMap.put("urls", ContactsContract.CommonDataKinds.Website.URL); dbMap.put("urls.value", ContactsContract.CommonDataKinds.Website.URL); - //dbMap.put("timezone", null); } /** @@ -142,9 +141,6 @@ public class ContactAccessorSdk5 extends ContactAccessor { */ @Override public JSONArray search(JSONArray fields, JSONObject options) { - long totalEnd; - long totalStart = System.currentTimeMillis(); - // Get the find options String searchTerm = ""; int limit = Integer.MAX_VALUE; @@ -180,7 +176,7 @@ public class ContactAccessorSdk5 extends ContactAccessor { // Build the ugly where clause and where arguments for one big query. WhereOptions whereOptions = buildWhereClause(fields, searchTerm); - + // Get all the id's where the search term matches the fields passed in. Cursor idCursor = mApp.getContentResolver().query(ContactsContract.Data.CONTENT_URI, new String[] { ContactsContract.Data.CONTACT_ID }, @@ -206,8 +202,49 @@ public class ContactAccessorSdk5 extends ContactAccessor { idOptions.getWhereArgs(), ContactsContract.Data.CONTACT_ID + " ASC"); - - //Log.d(LOG_TAG, "Cursor length = " + c.getCount()); + JSONArray contacts = populateContactArray(limit, populate, c); + return contacts; + } + + /** + * A special search that finds one contact by id + * + * @param id contact to find by id + * @return a JSONObject representing the contact + * @throws JSONException + */ + public JSONObject getContactById(String id) throws JSONException { + // Do the id query + Cursor c = mApp.getContentResolver().query(ContactsContract.Data.CONTENT_URI, + null, + ContactsContract.Data.CONTACT_ID + " = ? ", + new String[] { id }, + ContactsContract.Data.CONTACT_ID + " ASC"); + + JSONArray fields = new JSONArray(); + fields.put("*"); + + HashMap populate = buildPopulationSet(fields); + + JSONArray contacts = populateContactArray(1, populate, c); + + if (contacts.length() == 1) { + return contacts.getJSONObject(0); + } else { + return null; + } + } + + /** + * Creates an array of contacts from the cursor you pass in + * + * @param limit max number of contacts for the array + * @param populate whether or not you should populate a certain value + * @param c the cursor + * @return a JSONArray of contacts + */ + private JSONArray populateContactArray(int limit, + HashMap populate, Cursor c) { String contactId = ""; String rawId = ""; @@ -334,12 +371,8 @@ public class ContactAccessorSdk5 extends ContactAccessor { } } c.close(); - - - totalEnd = System.currentTimeMillis(); - Log.d(LOG_TAG,"Total time = " + (totalEnd-totalStart)); - return contacts; - } + return contacts; + } /** * Builds a where clause all all the ids passed into the method @@ -418,15 +451,67 @@ public class ContactAccessorSdk5 extends ContactAccessor { ArrayList whereArgs = new ArrayList(); WhereOptions options = new WhereOptions(); + + /* + * Special case where the user wants all fields returned + */ + if (isWildCardSearch(fields)) { + // Get all contacts with all properties + if ("%".equals(searchTerm)) { + options.setWhere("(" + ContactsContract.Contacts.DISPLAY_NAME + " LIKE ? )"); + options.setWhereArgs(new String[] {searchTerm}); + return options; + } else { + // Get all contacts that match the filter but return all properties + where.add("(" + dbMap.get("displayName") + " LIKE ? )"); + whereArgs.add(searchTerm); + where.add("(" + dbMap.get("name") + " LIKE ? AND " + + ContactsContract.Data.MIMETYPE + " = ? )"); + whereArgs.add(searchTerm); + whereArgs.add(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE); + where.add("(" + dbMap.get("nickname") + " LIKE ? AND " + + ContactsContract.Data.MIMETYPE + " = ? )"); + whereArgs.add(searchTerm); + whereArgs.add(ContactsContract.CommonDataKinds.Nickname.CONTENT_ITEM_TYPE); + where.add("(" + dbMap.get("phoneNumbers") + " LIKE ? AND " + + ContactsContract.Data.MIMETYPE + " = ? )"); + whereArgs.add(searchTerm); + whereArgs.add(ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE); + where.add("(" + dbMap.get("emails") + " LIKE ? AND " + + ContactsContract.Data.MIMETYPE + " = ? )"); + whereArgs.add(searchTerm); + whereArgs.add(ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE); + where.add("(" + dbMap.get("addresses") + " LIKE ? AND " + + ContactsContract.Data.MIMETYPE + " = ? )"); + whereArgs.add(searchTerm); + whereArgs.add(ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE); + where.add("(" + dbMap.get("ims") + " LIKE ? AND " + + ContactsContract.Data.MIMETYPE + " = ? )"); + whereArgs.add(searchTerm); + whereArgs.add(ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE); + where.add("(" + dbMap.get("organizations") + " LIKE ? AND " + + ContactsContract.Data.MIMETYPE + " = ? )"); + whereArgs.add(searchTerm); + whereArgs.add(ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE); + where.add("(" + dbMap.get("note") + " LIKE ? AND " + + ContactsContract.Data.MIMETYPE + " = ? )"); + whereArgs.add(searchTerm); + whereArgs.add(ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE); + where.add("(" + dbMap.get("urls") + " LIKE ? AND " + + ContactsContract.Data.MIMETYPE + " = ? )"); + whereArgs.add(searchTerm); + whereArgs.add(ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE); + } + } /* - * Special case for when the user wants all the contacts + * Special case for when the user wants all the contacts but */ if ("%".equals(searchTerm)) { options.setWhere("(" + ContactsContract.Contacts.DISPLAY_NAME + " LIKE ? )"); options.setWhereArgs(new String[] {searchTerm}); return options; - } + } String key; try { @@ -434,10 +519,14 @@ public class ContactAccessorSdk5 extends ContactAccessor { for (int i=0; i ops = new ArrayList(); @@ -1463,18 +1588,21 @@ public class ContactAccessorSdk5 extends ContactAccessor { Log.d(LOG_TAG, "Could not get photos"); } - boolean retVal = true; + String newId = null; //Add contact try { - mApp.getContentResolver().applyBatch(ContactsContract.AUTHORITY, ops); + ContentProviderResult[] cpResults = mApp.getContentResolver().applyBatch(ContactsContract.AUTHORITY, ops); + if (cpResults.length >= 0) { + newId = cpResults[0].uri.getLastPathSegment(); + } } catch (RemoteException e) { Log.e(LOG_TAG, e.getMessage(), e); - retVal = false; + newId = null; } catch (OperationApplicationException e) { Log.e(LOG_TAG, e.getMessage(), e); - retVal = false; + newId = null; } - return retVal; + return newId; } @Override @@ -1645,58 +1773,144 @@ public class ContactAccessorSdk5 extends ContactAccessor { return stringType; } - /** - * Converts a string from the W3C Contact API to it's Android int value. - * @param string - * @return Android int value - */ - private int getContactType(String string) { - int type = ContactsContract.CommonDataKinds.Email.TYPE_OTHER; - if (string!=null) { - if ("home".equals(string.toLowerCase())) { - return ContactsContract.CommonDataKinds.Email.TYPE_HOME; - } - else if ("work".equals(string.toLowerCase())) { - return ContactsContract.CommonDataKinds.Email.TYPE_WORK; - } - else if ("other".equals(string.toLowerCase())) { - return ContactsContract.CommonDataKinds.Email.TYPE_OTHER; - } - else if ("mobile".equals(string.toLowerCase())) { - return ContactsContract.CommonDataKinds.Email.TYPE_MOBILE; - } - else if ("custom".equals(string.toLowerCase())) { - return ContactsContract.CommonDataKinds.Email.TYPE_CUSTOM; - } - } - return type; - } + /** + * Converts a string from the W3C Contact API to it's Android int value. + * @param string + * @return Android int value + */ + private int getContactType(String string) { + int type = ContactsContract.CommonDataKinds.Email.TYPE_OTHER; + if (string!=null) { + if ("home".equals(string.toLowerCase())) { + return ContactsContract.CommonDataKinds.Email.TYPE_HOME; + } + else if ("work".equals(string.toLowerCase())) { + return ContactsContract.CommonDataKinds.Email.TYPE_WORK; + } + else if ("other".equals(string.toLowerCase())) { + return ContactsContract.CommonDataKinds.Email.TYPE_OTHER; + } + else if ("mobile".equals(string.toLowerCase())) { + return ContactsContract.CommonDataKinds.Email.TYPE_MOBILE; + } + else if ("custom".equals(string.toLowerCase())) { + return ContactsContract.CommonDataKinds.Email.TYPE_CUSTOM; + } + } + return type; + } - /** - * getPhoneType converts an Android phone type into a string - * @param type - * @return phone type as string. - */ - private String getContactType(int type) { - String stringType; - switch (type) { - case ContactsContract.CommonDataKinds.Email.TYPE_CUSTOM: - stringType = "custom"; - break; - case ContactsContract.CommonDataKinds.Email.TYPE_HOME: - stringType = "home"; - break; - case ContactsContract.CommonDataKinds.Email.TYPE_WORK: - stringType = "work"; - break; - case ContactsContract.CommonDataKinds.Email.TYPE_MOBILE: - stringType = "mobile"; - break; - case ContactsContract.CommonDataKinds.Email.TYPE_OTHER: - default: - stringType = "other"; - break; - } - return stringType; - } + /** + * getPhoneType converts an Android phone type into a string + * @param type + * @return phone type as string. + */ + private String getContactType(int type) { + String stringType; + switch (type) { + case ContactsContract.CommonDataKinds.Email.TYPE_CUSTOM: + stringType = "custom"; + break; + case ContactsContract.CommonDataKinds.Email.TYPE_HOME: + stringType = "home"; + break; + case ContactsContract.CommonDataKinds.Email.TYPE_WORK: + stringType = "work"; + break; + case ContactsContract.CommonDataKinds.Email.TYPE_MOBILE: + stringType = "mobile"; + break; + case ContactsContract.CommonDataKinds.Email.TYPE_OTHER: + default: + stringType = "other"; + break; + } + return stringType; + } + + /** + * Converts a string from the W3C Contact API to it's Android int value. + * @param string + * @return Android int value + */ + private int getOrgType(String string) { + int type = ContactsContract.CommonDataKinds.Organization.TYPE_OTHER; + if (string!=null) { + if ("work".equals(string.toLowerCase())) { + return ContactsContract.CommonDataKinds.Organization.TYPE_WORK; + } + else if ("other".equals(string.toLowerCase())) { + return ContactsContract.CommonDataKinds.Organization.TYPE_OTHER; + } + else if ("custom".equals(string.toLowerCase())) { + return ContactsContract.CommonDataKinds.Organization.TYPE_CUSTOM; + } + } + return type; + } + + /** + * getPhoneType converts an Android phone type into a string + * @param type + * @return phone type as string. + */ + private String getOrgType(int type) { + String stringType; + switch (type) { + case ContactsContract.CommonDataKinds.Organization.TYPE_CUSTOM: + stringType = "custom"; + break; + case ContactsContract.CommonDataKinds.Organization.TYPE_WORK: + stringType = "work"; + break; + case ContactsContract.CommonDataKinds.Organization.TYPE_OTHER: + default: + stringType = "other"; + break; + } + return stringType; + } + + /** + * Converts a string from the W3C Contact API to it's Android int value. + * @param string + * @return Android int value + */ + private int getAddressType(String string) { + int type = ContactsContract.CommonDataKinds.StructuredPostal.TYPE_OTHER; + if (string!=null) { + if ("work".equals(string.toLowerCase())) { + return ContactsContract.CommonDataKinds.StructuredPostal.TYPE_WORK; + } + else if ("other".equals(string.toLowerCase())) { + return ContactsContract.CommonDataKinds.StructuredPostal.TYPE_OTHER; + } + else if ("home".equals(string.toLowerCase())) { + return ContactsContract.CommonDataKinds.StructuredPostal.TYPE_HOME; + } + } + return type; + } + + /** + * getPhoneType converts an Android phone type into a string + * @param type + * @return phone type as string. + */ + private String getAddressType(int type) { + String stringType; + switch (type) { + case ContactsContract.CommonDataKinds.StructuredPostal.TYPE_HOME: + stringType = "home"; + break; + case ContactsContract.CommonDataKinds.StructuredPostal.TYPE_WORK: + stringType = "work"; + break; + case ContactsContract.CommonDataKinds.StructuredPostal.TYPE_OTHER: + default: + stringType = "other"; + break; + } + return stringType; + } } \ No newline at end of file diff --git a/framework/src/com/phonegap/ContactManager.java b/framework/src/com/phonegap/ContactManager.java index 7ef70c18..60edd545 100755 --- a/framework/src/com/phonegap/ContactManager.java +++ b/framework/src/com/phonegap/ContactManager.java @@ -43,29 +43,26 @@ public class ContactManager extends Plugin { try { if (action.equals("search")) { JSONArray res = contactAccessor.search(args.getJSONArray(0), args.optJSONObject(1)); - return new PluginResult(status, res, "navigator.service.contacts.cast"); + return new PluginResult(status, res, "navigator.contacts.cast"); } else if (action.equals("save")) { - if (contactAccessor.save(args.getJSONObject(0))) { - return new PluginResult(status, result); - } - else { - JSONObject r = new JSONObject(); - r.put("code", 0); - return new PluginResult(PluginResult.Status.ERROR, r); + String id = contactAccessor.save(args.getJSONObject(0)); + if (id != null) { + JSONObject res = contactAccessor.getContactById(id); + if (res != null) { + return new PluginResult(status, res); + } } } else if (action.equals("remove")) { if (contactAccessor.remove(args.getString(0))) { return new PluginResult(status, result); } - else { - JSONObject r = new JSONObject(); - r.put("code", 2); - return new PluginResult(PluginResult.Status.ERROR, r); - } } - return new PluginResult(status, result); + // If we get to this point an error has occurred + JSONObject r = new JSONObject(); + r.put("code", 0); + return new PluginResult(PluginResult.Status.ERROR, r); } catch (JSONException e) { Log.e(LOG_TAG, e.getMessage(), e); return new PluginResult(PluginResult.Status.JSON_EXCEPTION);