From 5f55ebf1d9381883d41c7bf3bc4a05d742fe905e Mon Sep 17 00:00:00 2001
From: macdonst <simon.macdonald@gmail.com>
Date: Tue, 2 Nov 2010 05:16:00 +0800
Subject: [PATCH] Adding Contact.save() for Android 1.X and Android 2.X

---
 framework/assets/js/contact.js                |   54 +-
 framework/assets/js/phonegap.js.base          |   33 +-
 .../src/com/phonegap/ContactAccessor.java     |   27 +-
 .../com/phonegap/ContactAccessorSdk3_4.java   |  384 +++++-
 .../src/com/phonegap/ContactAccessorSdk5.java | 1106 ++++++++++++++++-
 .../src/com/phonegap/ContactManager.java      |    2 +-
 6 files changed, 1576 insertions(+), 30 deletions(-)

diff --git a/framework/assets/js/contact.js b/framework/assets/js/contact.js
index 974b9f65..ee99e0d4 100755
--- a/framework/assets/js/contact.js
+++ b/framework/assets/js/contact.js
@@ -36,6 +36,7 @@ var Contact = function(id, displayName, name, nickname, phoneNumbers, emails, ad
     ims, organizations, published, updated, birthday, anniversary, gender, note,
     preferredUsername, photos, tags, relationships, urls, accounts, utcOffset, connected) {
     this.id = id || null;
+    this.rawId = null;
     this.displayName = displayName || null;
     this.name = name || null; // ContactName
     this.nickname = nickname || null;
@@ -83,6 +84,48 @@ Contact.prototype.remove = function(successCB, errorCB) {
 Contact.prototype.clone = function() {
     var clonedContact = PhoneGap.clone(this);
     clonedContact.id = null;
+    clonedContact.rawId = null;
+    // Loop through and clear out any id's in phones, emails, etc.
+    if (clonedContact.phoneNumbers) {
+    	for (i=0; i<clonedContact.phoneNumbers.length; i++) {
+    		clonedContact.phoneNumbers[i].id = null;
+    	}
+    }
+    if (clonedContact.emails) {
+    	for (i=0; i<clonedContact.emails.length; i++) {
+    		clonedContact.emails[i].id = null;
+    	}
+    }
+    if (clonedContact.addresses) {
+    	for (i=0; i<clonedContact.addresses.length; i++) {
+    		clonedContact.addresses[i].id = null;
+    	}
+    }
+    if (clonedContact.ims) {
+    	for (i=0; i<clonedContact.ims.length; i++) {
+    		clonedContact.ims[i].id = null;
+    	}
+    }
+    if (clonedContact.organizations) {
+    	for (i=0; i<clonedContact.organizations.length; i++) {
+    		clonedContact.organizations[i].id = null;
+    	}
+    }
+    if (clonedContact.tags) {
+    	for (i=0; i<clonedContact.tags.length; i++) {
+    		clonedContact.tags[i].id = null;
+    	}
+    }
+    if (clonedContact.relationships) {
+    	for (i=0; i<clonedContact.relationships.length; i++) {
+    		clonedContact.relationships[i].id = null;
+    	}
+    }
+    if (clonedContact.urls) {
+    	for (i=0; i<clonedContact.urls.length; i++) {
+    		clonedContact.urls[i].id = null;
+    	}
+    }
     return clonedContact;
 };
 
@@ -92,6 +135,7 @@ Contact.prototype.clone = function() {
 * @param errorCB error callback
 */
 Contact.prototype.save = function(successCB, errorCB) {
+    PhoneGap.exec(successCB, errorCB, "Contacts", "save", [this]);
 };
 
 /**
@@ -114,11 +158,13 @@ var ContactName = function(formatted, familyName, givenName, middle, prefix, suf
 
 /**
 * Generic contact field.
+* @param {DOMString} id unique identifier, should only be set by native code
 * @param type
 * @param value
 * @param primary
 */
 var ContactField = function(type, value, primary) {
+	this.id = null;
     this.type = type || null;
     this.value = value || null;
     this.primary = primary || null;
@@ -126,6 +172,7 @@ var ContactField = function(type, value, primary) {
 
 /**
 * Contact address.
+* @param {DOMString} id unique identifier, should only be set by native code
 * @param formatted
 * @param streetAddress
 * @param locality
@@ -134,6 +181,7 @@ var ContactField = function(type, value, primary) {
 * @param country
 */
 var ContactAddress = function(formatted, streetAddress, locality, region, postalCode, country) {
+	this.id = null;
     this.formatted = formatted || null;
     this.streetAddress = streetAddress || null;
     this.locality = locality || null;
@@ -144,6 +192,7 @@ var ContactAddress = function(formatted, streetAddress, locality, region, postal
 
 /**
 * Contact organization.
+* @param {DOMString} id unique identifier, should only be set by native code
 * @param name
 * @param dept
 * @param title
@@ -153,6 +202,7 @@ var ContactAddress = function(formatted, streetAddress, locality, region, postal
 * @param desc
 */
 var ContactOrganization = function(name, dept, title, startDate, endDate, location, desc) {
+	this.id = null;
     this.name = name || null;
     this.department = dept || null;
     this.title = title || null;
@@ -164,11 +214,13 @@ var ContactOrganization = function(name, dept, title, startDate, endDate, locati
 
 /**
 * Contact account.
+* @param {DOMString} id unique identifier, should only be set by native code
 * @param domain
 * @param username
 * @param userid
 */
 var ContactAccount = function(domain, username, userid) {
+	this.id = null;
     this.domain = domain || null;
     this.username = username || null;
     this.userid = userid || null;
@@ -201,7 +253,7 @@ Contacts.prototype.find = function(fields, successCB, errorCB, options) {
 * @returns new Contact object
 */
 Contacts.prototype.create = function(properties) {
-    var contact = new Contact();
+	var contact = new Contact();
     for (i in properties) {
         if (contact[i]!='undefined') {
             contact[i]=properties[i];
diff --git a/framework/assets/js/phonegap.js.base b/framework/assets/js/phonegap.js.base
index 47c2670e..9768ecee 100755
--- a/framework/assets/js/phonegap.js.base
+++ b/framework/assets/js/phonegap.js.base
@@ -318,18 +318,27 @@ PhoneGap.stringify = function(args) {
             	var start = true;
             	s = s + '{';
             	for (var name in args[i]) {
-            		if (!start) {
-            			s = s + ',';
-            		}
-            		s = s + '"' + name + '":';
-            		var nameType = typeof args[i][name];
-            		if ((nameType == "number") || (nameType == "boolean")) {
-            			s = s + args[i][name];
-            		}
-            		else {
-                        s = s + '"' + args[i][name] + '"';            			
-            		}
-                    start=false;
+            		if (args[i][name] != null) {
+	            		if (!start) {
+	            			s = s + ',';
+	            		}
+	            		s = s + '"' + name + '":';
+	            		var nameType = typeof args[i][name];
+	            		if ((nameType == "number") || (nameType == "boolean")) {
+	            			s = s + args[i][name];
+	            		}
+	            		else if ((typeof args[i][name]) == 'function') {
+		           			// don't copy the functions
+	            			s = s + '""'; 
+	            		}
+	            		else if (args[i][name] instanceof Object) {
+	            			s = s + this.stringify(args[i][name]);
+	            		}
+	            		else {
+	                        s = s + '"' + args[i][name] + '"';            			
+	            		}
+	                    start=false;
+	                 }
             	} 
             	s = s + '}';
             }
diff --git a/framework/src/com/phonegap/ContactAccessor.java b/framework/src/com/phonegap/ContactAccessor.java
index 352853ba..f6e88926 100644
--- a/framework/src/com/phonegap/ContactAccessor.java
+++ b/framework/src/com/phonegap/ContactAccessor.java
@@ -162,11 +162,36 @@ public abstract class ContactAccessor {
 		}
 		return map;
 	}
+	
+	/**
+	 * Convenience method to get a string from a JSON object.  Saves a 
+	 * lot of try/catch writing.
+	 * If the property is not found in the object null will be returned.
+	 * 
+	 * @param obj contact object to search
+	 * @param property to be looked up
+	 * @return The value of the property
+	 */
+	protected String getJsonString(JSONObject obj, String property) {
+		String value = null;
+		try {
+			value = obj.getString(property);
+			if (value.equals("null")) {
+				Log.d(LOG_TAG, property + " is string called 'null'");
+				value = null;
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get = " + e.getMessage());
+		}		
+		return value;
+	}
 
     /**
      * Handles adding a JSON Contact object into the database.
+     * @return TODO
      */
-	public abstract void save(JSONObject contact);
+	public abstract boolean save(JSONObject contact);
 
     /**
      * Handles searching through SDK-specific contacts API.
diff --git a/framework/src/com/phonegap/ContactAccessorSdk3_4.java b/framework/src/com/phonegap/ContactAccessorSdk3_4.java
index c6d213ab..42ff8fb8 100644
--- a/framework/src/com/phonegap/ContactAccessorSdk3_4.java
+++ b/framework/src/com/phonegap/ContactAccessorSdk3_4.java
@@ -36,6 +36,7 @@ import org.json.JSONObject;
 
 import android.app.Activity;
 import android.content.ContentResolver;
+import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.Contacts;
@@ -62,6 +63,7 @@ import android.webkit.WebView;
  */
 @SuppressWarnings("deprecation")
 public class ContactAccessorSdk3_4 extends ContactAccessor {
+	private static final String PEOPLE_ID_EQUALS = "people._id = ?";
 	/**
 	 * A static map that converts the JavaScript property name to Android database column name.
 	 */
@@ -140,7 +142,7 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 		    	// Do query for name and note
 		        Cursor cur = cr.query(People.CONTENT_URI, 
 					new String[] {People.DISPLAY_NAME, People.NOTES},
-					"people._id = ?",
+					PEOPLE_ID_EQUALS,
 					new String[] {contactId},
 					null);
 		        cur.moveToFirst();
@@ -305,11 +307,13 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 		while (cursor.moveToNext()) {
 			im = new JSONObject();
 			try{
+			im.put("id", cursor.getString(
+					cursor.getColumnIndex(ContactMethods._ID)));
 			im.put("primary", false);
 			im.put("value", cursor.getString(
 					cursor.getColumnIndex(ContactMethodsColumns.DATA)));
-			im.put("type", cursor.getString(
-					cursor.getColumnIndex(ContactMethodsColumns.TYPE)));
+			im.put("type", getContactType(cursor.getInt(
+					cursor.getColumnIndex(ContactMethodsColumns.TYPE))));
 			ims.put(im);
 			} catch (JSONException e) {
 				Log.e(LOG_TAG, e.getMessage(), e);
@@ -335,6 +339,7 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 		while (cursor.moveToNext()) {
 			organization = new JSONObject();
 			try{
+				organization.put("id", cursor.getString(cursor.getColumnIndex(Organizations._ID)));
 				organization.put("name", cursor.getString(cursor.getColumnIndex(Organizations.COMPANY)));
 				organization.put("title", cursor.getString(cursor.getColumnIndex(Organizations.TITLE)));
 				// organization.put("department", cursor.getString(cursor.getColumnIndex(Organizations)));
@@ -368,6 +373,7 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 		while (cursor.moveToNext()) {
 			address = new JSONObject();
 			try{
+				address.put("id", cursor.getString(cursor.getColumnIndex(ContactMethods._ID)));
 				address.put("formatted", cursor.getString(cursor.getColumnIndex(ContactMethodsColumns.DATA)));
 				addresses.put(address);
 			} catch (JSONException e) {
@@ -394,9 +400,10 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 		while (cursor.moveToNext()) {
 			phone = new JSONObject();
 			try{
+				phone.put("id", cursor.getString(cursor.getColumnIndex(Phones._ID)));
 				phone.put("primary", false);
 				phone.put("value", cursor.getString(cursor.getColumnIndex(Phones.NUMBER)));
-				phone.put("type", cursor.getString(cursor.getColumnIndex(Phones.TYPE)));
+				phone.put("type", getPhoneType(cursor.getInt(cursor.getColumnIndex(Phones.TYPE))));
 				phones.put(phone);
 			} catch (JSONException e) {
 				Log.e(LOG_TAG, e.getMessage(), e);
@@ -422,6 +429,7 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 		while (cursor.moveToNext()) {
 			email = new JSONObject();
 			try{
+				email.put("id", cursor.getString(cursor.getColumnIndex(ContactMethods._ID)));
 				email.put("primary", false);
 				email.put("value", cursor.getString(cursor.getColumnIndex(ContactMethods.DATA)));
 				// TODO Find out why adding an email type throws and exception
@@ -434,10 +442,372 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 		return emails;
 	}
 
+	/**
+	 * This method will save a contact object into the devices contacts database.
+	 * 
+	 * @param contact the contact to be saved.
+	 * @returns true if the contact is successfully saved, false otherwise.
+	 */
 	@Override
-	public void save(JSONObject contact) {
-		// TODO Auto-generated method stub
+	public boolean save(JSONObject contact) {
+		ContentValues personValues = new ContentValues();
+
+		String id = getJsonString(contact, "id");
+			
+		String name = getJsonString(contact, "displayName");
+		if (name != null) {
+			personValues.put(Contacts.People.NAME, name);				
+		}
+		String note = getJsonString(contact, "note");
+		if (note != null) {
+			personValues.put(Contacts.People.NOTES, note);
+		}
+
+		/* STARRED 0 = Contacts, 1 = Favorites */
+		personValues.put(Contacts.People.STARRED, 0);
 		
+		Uri newPersonUri;
+		// Add new contact
+		if (id == null) {
+			newPersonUri = Contacts.People.createPersonInMyContactsGroup(mApp.getContentResolver(), personValues);
+		}
+		// modify existing contact
+		else {
+			newPersonUri = Uri.withAppendedPath(Contacts.People.CONTENT_URI, id);
+			mApp.getContentResolver().update(newPersonUri, personValues, PEOPLE_ID_EQUALS,  new String[]{id});
+		}
+		
+		if (newPersonUri != null) {
+			// phoneNumbers
+			savePhoneNumbers(contact, newPersonUri);
+			// emails
+			saveEntries(contact, newPersonUri, "emails", Contacts.KIND_EMAIL);
+			// addresses
+			saveAddresses(contact, newPersonUri);
+			// organizations
+			saveOrganizations(contact, newPersonUri);
+			// ims
+			saveEntries(contact, newPersonUri, "ims", Contacts.KIND_IM);
+			
+			// Successfully create a Contact
+			return true;
+		}
+		return false;
+	}
+	
+	/** 
+	 * Takes a JSON contact object and loops through the available organizations.  If the  
+	 * organization has an id that is not equal to null the organization will be updated in the database.
+	 * If the id is null then we treat it as a new organization.
+	 * 
+	 * @param contact the contact to extract the organizations from
+	 * @param uri the base URI for this contact.
+	 */
+	private void saveOrganizations(JSONObject contact, Uri newPersonUri) {
+		ContentValues values = new ContentValues();
+		Uri orgUri = Uri.withAppendedPath(newPersonUri,
+				Contacts.Organizations.CONTENT_DIRECTORY);
+		String id = null;
+		try {
+			JSONArray orgs = contact.getJSONArray("organizations");
+			if (orgs != null && orgs.length() > 0) {
+				JSONObject org;
+				for (int i=0; i<orgs.length(); i++) {
+					org = orgs.getJSONObject(i);
+					id = getJsonString(org, "id");					
+					values.put(Contacts.Organizations.COMPANY, getJsonString(org, "name"));
+					values.put(Contacts.Organizations.TITLE, getJsonString(org, "title"));
+					if (id == null) {
+						Uri contactUpdate = mApp.getContentResolver().insert(orgUri, values);
+					}
+					else {
+						Uri tempUri = Uri.withAppendedPath(orgUri, id);					
+						mApp.getContentResolver().update(tempUri, values, null, null);
+					}
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not save organizations = " + e.getMessage());
+		}
+	}
+
+	/** 
+	 * Takes a JSON contact object and loops through the available addresses.  If the  
+	 * address has an id that is not equal to null the address will be updated in the database.
+	 * If the id is null then we treat it as a new address.
+	 * 
+	 * @param contact the contact to extract the addresses from
+	 * @param uri the base URI for this contact.
+	 */
+	private void saveAddresses(JSONObject contact, Uri uri) {
+		ContentValues values = new ContentValues();
+		Uri newUri = Uri.withAppendedPath(uri,
+				Contacts.People.ContactMethods.CONTENT_DIRECTORY);
+		String id = null;
+		try {
+			JSONArray entries = contact.getJSONArray("addresses");
+			if (entries != null && entries.length() > 0) {
+				JSONObject entry;
+				values.put(Contacts.ContactMethods.KIND, Contacts.KIND_POSTAL);
+				for (int i=0; i<entries.length(); i++) {
+					entry = entries.getJSONObject(i);
+					id = getJsonString(entry, "id");
+					
+					String address = getJsonString(entry, "formatted");
+					if (address != null) {
+						values.put(Contacts.ContactMethods.DATA, address);
+					}
+					else {
+						values.put(Contacts.ContactMethods.DATA, createAddressString(entry));
+					}
+					
+					if (id == null) {
+						Uri contactUpdate = mApp.getContentResolver().insert(newUri, values);
+					}
+					else {
+						Uri tempUri = Uri.withAppendedPath(newUri, id);
+						mApp.getContentResolver().update(tempUri, values, null, null);
+					}
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not save address = " + e.getMessage());
+		}
+	}
+
+	/**
+	 * Takes a ContactAddress JSON object and creates a fully 
+	 * formatted address string.
+	 * 
+	 * @param entry the full address object
+	 * @return a formatted address string
+	 */
+	private String createAddressString(JSONObject entry) {
+		StringBuffer buffer = new StringBuffer("");
+		if (getJsonString(entry, "locality") != null ) {
+			buffer.append(getJsonString(entry, "locality"));
+		}
+		if (getJsonString(entry, "region") != null ) {
+			if (buffer.length() > 0 ) {
+				buffer.append(", ");
+			}
+			buffer.append(getJsonString(entry, "region"));
+		}
+		if (getJsonString(entry, "postalCode") != null ) {
+			if (buffer.length() > 0 ) {
+				buffer.append(", ");
+			}
+			buffer.append(getJsonString(entry, "postalCode"));
+		}
+		if (getJsonString(entry, "country") != null ) {
+			if (buffer.length() > 0 ) {
+				buffer.append(", ");
+			}
+			buffer.append(getJsonString(entry, "country"));
+		}
+		return buffer.toString();
+	}
+
+	/** 
+	 * Takes a JSON contact object and loops through the available entries (Emails/IM's).  If the  
+	 * entry has an id that is not equal to null the entry will be updated in the database.
+	 * If the id is null then we treat it as a new entry.
+	 * 
+	 * @param contact the contact to extract the entries from
+	 * @param uri the base URI for this contact.
+	 */
+	private void saveEntries(JSONObject contact, Uri uri, String dataType, int contactKind) {
+		ContentValues values = new ContentValues();
+		Uri newUri = Uri.withAppendedPath(uri,
+				Contacts.People.ContactMethods.CONTENT_DIRECTORY);
+		String id = null;
+
+		try {
+			JSONArray entries = contact.getJSONArray(dataType);
+			if (entries != null && entries.length() > 0) {
+				JSONObject entry;
+				values.put(Contacts.ContactMethods.KIND, contactKind);
+				for (int i=0; i<entries.length(); i++) {
+					entry = entries.getJSONObject(i);
+					id = getJsonString(entry, "id");
+					values.put(Contacts.ContactMethods.DATA, getJsonString(entry, "value"));
+					values.put(Contacts.ContactMethods.TYPE, getContactType(getJsonString(entry, "type")));
+					if (id==null) {
+						Uri contactUpdate = mApp.getContentResolver().insert(newUri, values);
+					}
+					else {
+						Uri tempUri = Uri.withAppendedPath(newUri, id);
+						mApp.getContentResolver().update(tempUri, values, null, null);
+					}
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not save " + dataType + " = " + e.getMessage());
+		}
+	}
+
+	/**
+	 * 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 = Contacts.ContactMethods.TYPE_OTHER;
+		if (string!=null) {
+			if ("home".equals(string.toLowerCase())) {
+				return Contacts.ContactMethods.TYPE_HOME;
+			}
+			else if ("work".equals(string.toLowerCase())) {
+				return Contacts.ContactMethods.TYPE_WORK;
+			}
+			else if ("other".equals(string.toLowerCase())) {
+				return Contacts.ContactMethods.TYPE_OTHER;
+			}
+			else if ("custom".equals(string.toLowerCase())) {
+				return Contacts.ContactMethods.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 Contacts.ContactMethods.TYPE_CUSTOM: 
+				stringType = "custom";
+				break;
+			case Contacts.ContactMethods.TYPE_HOME: 
+				stringType = "home";
+				break;
+			case Contacts.ContactMethods.TYPE_WORK: 
+				stringType = "work";
+				break;
+			case Contacts.ContactMethods.TYPE_OTHER: 
+			default: 
+				stringType = "other";
+				break;
+		}
+		return stringType;
+	}
+
+	/** 
+	 * Takes a JSON contact object and loops through the available phone numbers.  If the phone 
+	 * number has an id that is not equal to null the phone number will be updated in the database.
+	 * If the id is null then we treat it as a new phone number.
+	 * 
+	 * @param contact the contact to extract the phone numbers from
+	 * @param uri the base URI for this contact.
+	 */
+	private void savePhoneNumbers(JSONObject contact, Uri uri) {
+		ContentValues values = new ContentValues();
+		Uri phonesUri = Uri.withAppendedPath(uri,
+				Contacts.People.Phones.CONTENT_DIRECTORY);	
+		String id = null;
+
+		try {
+			JSONArray phones = contact.getJSONArray("phoneNumbers");
+			if (phones != null && phones.length() > 0) {
+				JSONObject phone;
+				for (int i=0; i<phones.length(); i++) {
+					phone = phones.getJSONObject(i);
+					id = getJsonString(phone, "id");
+					values.put(Contacts.Phones.NUMBER, getJsonString(phone, "value"));
+					values.put(Contacts.Phones.TYPE, getPhoneType(getJsonString(phone, "type")));
+					if (id==null) {
+						Uri phoneUpdate = mApp.getContentResolver().insert(phonesUri, values);
+					}
+					else {
+						Uri newUri = Uri.withAppendedPath(phonesUri, id);
+						mApp.getContentResolver().update(newUri, values, null, null);
+					}
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not save phones = " + e.getMessage());
+		}
+	}
+
+	/**
+	 * Converts a string from the W3C Contact API to it's Android int value.
+	 * @param string
+	 * @return Android int value
+	 */
+	private int getPhoneType(String string) {
+		int type = Contacts.Phones.TYPE_OTHER;
+		if ("home".equals(string.toLowerCase())) {
+			return Contacts.Phones.TYPE_HOME;
+		}
+		else if ("mobile".equals(string.toLowerCase())) {
+			return Contacts.Phones.TYPE_MOBILE;
+		}
+		else if ("work".equals(string.toLowerCase())) {
+			return Contacts.Phones.TYPE_WORK;
+		}
+		else if ("work fax".equals(string.toLowerCase())) {
+			return Contacts.Phones.TYPE_FAX_WORK;
+		}
+		else if ("home fax".equals(string.toLowerCase())) {
+			return Contacts.Phones.TYPE_FAX_HOME;
+		}
+		else if ("fax".equals(string.toLowerCase())) {
+			return Contacts.Phones.TYPE_FAX_WORK;
+		}
+		else if ("pager".equals(string.toLowerCase())) {
+			return Contacts.Phones.TYPE_PAGER;
+		}
+		else if ("other".equals(string.toLowerCase())) {
+			return Contacts.Phones.TYPE_OTHER;
+		}
+		else if ("custom".equals(string.toLowerCase())) {
+			return Contacts.Phones.TYPE_CUSTOM;
+		}
+		return type;
+	}
+
+	/**
+	 * getPhoneType converts an Android phone type into a string
+	 * @param type 
+	 * @return phone type as string.
+	 */
+	private String getPhoneType(int type) {
+		String stringType;
+		switch (type) {
+		case Contacts.Phones.TYPE_CUSTOM:
+			stringType = "custom";
+			break;
+		case Contacts.Phones.TYPE_FAX_HOME:
+			stringType = "home fax";
+			break;
+		case Contacts.Phones.TYPE_FAX_WORK:
+			stringType = "work fax";
+			break;
+		case Contacts.Phones.TYPE_HOME:
+			stringType = "home";
+			break;
+		case Contacts.Phones.TYPE_MOBILE:
+			stringType = "mobile";
+			break;
+		case Contacts.Phones.TYPE_PAGER:
+			stringType = "pager";
+			break;
+		case Contacts.Phones.TYPE_WORK:
+			stringType = "work";
+			break;
+		case Contacts.Phones.TYPE_OTHER:
+		default: 
+			stringType = "custom";
+			break;
+		}
+		return stringType;
 	}
 
 	@Override
@@ -447,7 +817,7 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 	 */
 	public boolean remove(String id) {
     	int result = mApp.getContentResolver().delete(People.CONTENT_URI, 
-    			"people._id = ?", 
+    			PEOPLE_ID_EQUALS, 
     			new String[] {id});
     	
     	return (result > 0) ? true : false;
diff --git a/framework/src/com/phonegap/ContactAccessorSdk5.java b/framework/src/com/phonegap/ContactAccessorSdk5.java
index 1267a64a..2fa976cc 100644
--- a/framework/src/com/phonegap/ContactAccessorSdk5.java
+++ b/framework/src/com/phonegap/ContactAccessorSdk5.java
@@ -32,8 +32,14 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import android.accounts.Account;
+import android.accounts.AccountManager;
 import android.app.Activity;
+import android.content.ContentProviderOperation;
+import android.content.ContentValues;
+import android.content.OperationApplicationException;
 import android.database.Cursor;
+import android.os.RemoteException;
 import android.provider.ContactsContract;
 import android.util.Log;
 import android.webkit.WebView;
@@ -151,6 +157,10 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 		} catch (JSONException e) {
 			Log.e(LOG_TAG, e.getMessage(), e);
 		}
+		
+		//Log.d(LOG_TAG, "Search Term = " + searchTerm);
+		//Log.d(LOG_TAG, "Field Length = " + fields.length());
+		//Log.d(LOG_TAG, "Fields = " + fields.toString());
 
 		// Loop through the fields the user provided to see what data should be returned.
 		HashMap<String,Boolean> populate = buildPopulationSet(fields);
@@ -165,7 +175,10 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 				whereOptions.getWhereArgs(),
 				ContactsContract.Data.CONTACT_ID + " ASC");				
 
+		//Log.d(LOG_TAG, "Cursor length = " + c.getCount());
+		
 		String contactId = "";
+		String rawId = "";
 		String oldContactId = "";
 		boolean newContact = true;
 		String mimetype = "";
@@ -180,9 +193,11 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 		JSONArray websites = new JSONArray();
 		JSONArray relationships = new JSONArray();			
 		
-		while (c.moveToNext() && (contacts.length() < (limit-1))) {					
+		while (c.moveToNext() && (contacts.length() <= (limit-1))) {					
 			try {
 				contactId = c.getString(c.getColumnIndex(ContactsContract.Data.CONTACT_ID));
+				rawId = c.getString(c.getColumnIndex(ContactsContract.Data.RAW_CONTACT_ID));				
+				//Log.d(LOG_TAG, "Contact ID = " + contactId + " Raw ID = " + rawId);
 				
 				// If we are in the first row set the oldContactId
 				if (c.getPosition() == 0) {
@@ -216,6 +231,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 				if (newContact) {
 					newContact = false;
 					contact.put("id", contactId);
+					contact.put("rawId", rawId);
 					contact.put("displayName", c.getString(c.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME)));
 				}
 				
@@ -345,6 +361,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 		
 		String key;
 		try {
+			Log.d(LOG_TAG, "How many fields do we have = " + fields.length());
 			for (int i=0; i<fields.length(); i++) {
 				key = fields.getString(i);
 
@@ -437,6 +454,9 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 			}
 		}
 		options.setWhere(selection.toString());
+		
+		Log.d(LOG_TAG, "The where clause is:");
+		Log.d(LOG_TAG, selection.toString());
 
 		// Creating the where args array
 		String[] selectionArgs = new String[whereArgs.size()];
@@ -456,6 +476,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 	private JSONObject organizationQuery(Cursor cursor) {
 		JSONObject organization = new JSONObject();
 		try {
+			organization.put("id", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Organization._ID)));
 			organization.put("department", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Organization.DEPARTMENT)));
 			organization.put("description", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Organization.JOB_DESCRIPTION)));
 			// TODO No endDate
@@ -479,6 +500,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 	private JSONObject addressQuery(Cursor cursor) {
 		JSONObject address = new JSONObject();
 		try {
+			address.put("id", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.StructuredPostal._ID)));
 			address.put("formatted", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS)));
 			address.put("streetAddress", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.StructuredPostal.STREET)));
 			address.put("locality", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.StructuredPostal.CITY)));
@@ -533,9 +555,10 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 	private JSONObject phoneQuery(Cursor cursor) {
 		JSONObject phoneNumber = new JSONObject();
 		try {
+			phoneNumber.put("id", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone._ID)));
 			phoneNumber.put("primary", false); // Android does not store primary attribute
 			phoneNumber.put("value", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER)));
-			phoneNumber.put("type", cursor.getInt(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.TYPE)));
+			phoneNumber.put("type", getPhoneType(cursor.getInt(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.TYPE))));
 		} catch (JSONException e) {
 			Log.e(LOG_TAG, e.getMessage(), e);
 		}
@@ -553,9 +576,10 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 	private JSONObject emailQuery(Cursor cursor) {
 		JSONObject email = new JSONObject();
 		try {
+			email.put("id", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email._ID)));
 			email.put("primary", false); // Android does not store primary attribute
 			email.put("value", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.DATA)));
-			email.put("type", cursor.getInt(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.TYPE)));
+			email.put("type", getContactType(cursor.getInt(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.TYPE))));
 		} catch (JSONException e) {
 			Log.e(LOG_TAG, e.getMessage(), e);
 		}
@@ -570,9 +594,10 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 	private JSONObject imQuery(Cursor cursor) {
 		JSONObject im = new JSONObject();
 		try {
+			im.put("id", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Im._ID)));
 			im.put("primary", false); // Android does not store primary attribute
 			im.put("value", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Im.DATA)));
-			im.put("type", cursor.getInt(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Im.TYPE)));
+			im.put("type", getContactType(cursor.getInt(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Im.TYPE))));
 		} catch (JSONException e) {
 			Log.e(LOG_TAG, e.getMessage(), e);
 		}
@@ -587,9 +612,10 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 	private JSONObject websiteQuery(Cursor cursor) {
 		JSONObject website = new JSONObject();
 		try {
+			website.put("id", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Website._ID)));
 			website.put("primary", false); // Android does not store primary attribute
 			website.put("value", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Website.URL)));
-			website.put("type", cursor.getInt(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Website.TYPE)));
+			website.put("type", getContactType(cursor.getInt(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Website.TYPE))));
 		} catch (JSONException e) {
 			Log.e(LOG_TAG, e.getMessage(), e);
 		}
@@ -604,9 +630,10 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 	private JSONObject relationshipQuery(Cursor cursor) {
 		JSONObject relationship = new JSONObject();
 		try {
+			relationship.put("id", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Relation._ID)));
 			relationship.put("primary", false); // Android does not store primary attribute
 			relationship.put("value", cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Relation.NAME)));
-			relationship.put("type", cursor.getInt(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Relation.TYPE)));
+			relationship.put("type", getRelationshipType(cursor.getInt(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Relation.TYPE))));
 		} catch (JSONException e) {
 			Log.e(LOG_TAG, e.getMessage(), e);
 		}
@@ -614,8 +641,745 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 	}	
 
 	@Override
-	public void save(JSONObject contact) {
-		// TODO Auto-generated method stub
+	/**
+	 * This method will save a contact object into the devices contacts database.
+	 * 
+	 * @param contact the contact to be saved.
+	 * @returns true if the contact is successfully saved, false otherwise.
+	 */
+	public boolean save(JSONObject contact) {
+		AccountManager mgr = AccountManager.get(mApp);
+		Account[] accounts = mgr.getAccounts();
+
+		// TODO For now we are assuming that we should use the first 
+		// account found in the list of accounts
+		if (accounts.length < 1) {
+			return false;
+		}
+		
+		String id = getJsonString(contact, "id");
+		// Create new contact
+		if (id==null) {		
+		    return createNewContact(contact, accounts[0]);
+		}
+		// Modify existing contact
+		else {
+			return modifyContact(id, contact, accounts[0]);
+		}
+	}
+
+	/**
+	 * Creates a new contact and stores it in the database
+	 * 
+	 * @param id the raw contact id which is required for linking items to the contact
+	 * @param contact the contact to be saved
+	 * @param account the account to be saved under
+	 */
+	private boolean modifyContact(String id, JSONObject contact, Account account) {
+		// Get the RAW_CONTACT_ID which is needed to insert new values in an already existing contact.
+		// But not needed to update existing values.
+		int rawId = (new Integer(getJsonString(contact,"rawId"))).intValue();
+		
+		// Create a list of attributes to add to the contact database
+		ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+		
+		//Add contact type
+		ops.add(ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
+		        .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, account.type)
+		        .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, account.name)
+		        .build());
+		
+		// Modify display name
+		String displayName = getJsonString(contact, "displayName");
+		if (displayName != null) {
+			ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
+				.withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " + 
+						ContactsContract.Data.MIMETYPE + "=?", 
+						new String[]{id, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE})
+				.withValue(ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME, getJsonString(contact, "displayName"))
+				.build());
+		}
+
+		// Modify name
+		JSONObject name;
+		try {
+			name = contact.getJSONObject("name");
+			if (name != null) {
+				ContentProviderOperation.Builder builder = ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
+					.withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " + 
+							ContactsContract.Data.MIMETYPE + "=?", 
+							new String[]{id, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE});
+
+				String familyName = getJsonString(name, "familyName");
+				if (familyName != null) {
+					builder.withValue(ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME, familyName);
+				}
+				String middleName = getJsonString(name, "familyName");
+				if (middleName != null) {
+					builder.withValue(ContactsContract.CommonDataKinds.StructuredName.MIDDLE_NAME, middleName);
+				}
+				String givenName = getJsonString(name, "givenName");
+				if (givenName != null) {
+					builder.withValue(ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME, givenName);
+				}
+				String honorificPrefix = getJsonString(name, "honorificPrefix");
+				if (honorificPrefix != null) {
+					builder.withValue(ContactsContract.CommonDataKinds.StructuredName.PREFIX, honorificPrefix);
+				}
+				String honorificSuffix = getJsonString(name, "honorificSuffix");
+				if (honorificSuffix != null) {
+					builder.withValue(ContactsContract.CommonDataKinds.StructuredName.SUFFIX, honorificSuffix);
+				}
+				
+				ops.add(builder.build());
+			}
+		} catch (JSONException e1) {
+			Log.d(LOG_TAG, "Could not get name");
+		}
+		
+		// Modify phone numbers
+		JSONArray phones = null;
+		try {
+			phones = contact.getJSONArray("phoneNumbers");
+			if (phones != null) {
+				for (int i=0; i<phones.length(); i++) {
+					JSONObject phone = (JSONObject)phones.get(i);
+					String phoneId = getJsonString(phone, "id");
+					// This is a new phone so do a DB insert
+					if (phoneId == null) {
+						ContentValues contentValues = new ContentValues();
+					    contentValues.put(ContactsContract.Data.RAW_CONTACT_ID, rawId);
+					    contentValues.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
+					    contentValues.put(ContactsContract.CommonDataKinds.Phone.NUMBER, getJsonString(phone, "value"));
+					    contentValues.put(ContactsContract.CommonDataKinds.Phone.TYPE, getPhoneType(getJsonString(phone, "type")));
+
+					    ops.add(ContentProviderOperation.newInsert(
+					            ContactsContract.Data.CONTENT_URI).withValues(contentValues).build()); 						
+					}
+					// This is an existing phone so do a DB update
+					else {
+						ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
+						        .withSelection(ContactsContract.CommonDataKinds.Phone._ID + "=? AND " + 
+									ContactsContract.Data.MIMETYPE + "=?", 
+									new String[]{phoneId, ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE})
+						        .withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, getJsonString(phone, "value"))
+						        .withValue(ContactsContract.CommonDataKinds.Phone.TYPE, getPhoneType(getJsonString(phone, "type")))
+						        .build());
+					}
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get phone numbers");
+		}
+		
+		// Modify emails
+		JSONArray emails = null;
+		try {
+			emails = contact.getJSONArray("emails");
+			if (emails != null) {
+				for (int i=0; i<emails.length(); i++) {
+					JSONObject email = (JSONObject)emails.get(i);
+					String emailId = getJsonString(email, "id");
+					// This is a new email so do a DB insert
+					if (emailId==null) {
+						ContentValues contentValues = new ContentValues();
+					    contentValues.put(ContactsContract.Data.RAW_CONTACT_ID, rawId);
+					    contentValues.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE);
+					    contentValues.put(ContactsContract.CommonDataKinds.Email.DATA, getJsonString(email, "value"));
+					    contentValues.put(ContactsContract.CommonDataKinds.Email.TYPE, getContactType(getJsonString(email, "type")));
+
+					    ops.add(ContentProviderOperation.newInsert(
+					            ContactsContract.Data.CONTENT_URI).withValues(contentValues).build()); 						
+					}
+					// This is an existing email so do a DB update
+					else {
+						ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
+						        .withSelection(ContactsContract.CommonDataKinds.Email._ID + "=? AND " + 
+									ContactsContract.Data.MIMETYPE + "=?", 
+									new String[]{emailId, ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE})
+						        .withValue(ContactsContract.CommonDataKinds.Email.DATA, getJsonString(email, "value"))
+						        .withValue(ContactsContract.CommonDataKinds.Email.TYPE, getContactType(getJsonString(email, "type")))
+						        .build());
+					}
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get emails");
+		}
+
+		// Modify addresses
+		JSONArray addresses = null;
+		try {
+			addresses = contact.getJSONArray("addresses");
+			if (addresses != null) {
+				for (int i=0; i<addresses.length(); i++) {
+					JSONObject address = (JSONObject)addresses.get(i);
+					String addressId = getJsonString(address, "id");
+					// This is a new address so do a DB insert
+					if (addressId==null) {
+						ContentValues contentValues = new ContentValues();
+					    contentValues.put(ContactsContract.Data.RAW_CONTACT_ID, rawId);
+					    contentValues.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE);
+					    contentValues.put(ContactsContract.CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS, getJsonString(address, "formatted"));
+				        contentValues.put(ContactsContract.CommonDataKinds.StructuredPostal.STREET, getJsonString(address, "streetAddress"));
+				        contentValues.put(ContactsContract.CommonDataKinds.StructuredPostal.CITY, getJsonString(address, "locality"));
+				        contentValues.put(ContactsContract.CommonDataKinds.StructuredPostal.REGION, getJsonString(address, "region"));
+				        contentValues.put(ContactsContract.CommonDataKinds.StructuredPostal.POSTCODE, getJsonString(address, "postalCode"));
+				        contentValues.put(ContactsContract.CommonDataKinds.StructuredPostal.COUNTRY, getJsonString(address, "country"));
+
+					    ops.add(ContentProviderOperation.newInsert(
+					            ContactsContract.Data.CONTENT_URI).withValues(contentValues).build()); 						
+					}
+					// This is an existing address so do a DB update
+					else {
+						ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
+						        .withSelection(ContactsContract.CommonDataKinds.StructuredPostal._ID + "=? AND " + 
+										ContactsContract.Data.MIMETYPE + "=?", 
+										new String[]{addressId, ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE})
+						        .withValue(ContactsContract.CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS, getJsonString(address, "formatted"))
+						        .withValue(ContactsContract.CommonDataKinds.StructuredPostal.STREET, getJsonString(address, "streetAddress"))
+						        .withValue(ContactsContract.CommonDataKinds.StructuredPostal.CITY, getJsonString(address, "locality"))
+						        .withValue(ContactsContract.CommonDataKinds.StructuredPostal.REGION, getJsonString(address, "region"))
+						        .withValue(ContactsContract.CommonDataKinds.StructuredPostal.POSTCODE, getJsonString(address, "postalCode"))
+						        .withValue(ContactsContract.CommonDataKinds.StructuredPostal.COUNTRY, getJsonString(address, "country"))
+						        .build());
+					}
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get addresses");
+		}
+
+		// Modify organizations
+		JSONArray organizations = null;
+		try {
+			organizations = contact.getJSONArray("organizations");
+			if (organizations != null) {
+				for (int i=0; i<organizations.length(); i++) {
+					JSONObject org = (JSONObject)organizations.get(i);
+					String orgId = getJsonString(org, "id");;
+					// This is a new organization so do a DB insert
+					if (orgId==null) {
+						ContentValues contentValues = new ContentValues();
+					    contentValues.put(ContactsContract.Data.RAW_CONTACT_ID, rawId);
+					    contentValues.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE);
+					    contentValues.put(ContactsContract.CommonDataKinds.Organization.DEPARTMENT, getJsonString(org, "department"));
+				        contentValues.put(ContactsContract.CommonDataKinds.Organization.JOB_DESCRIPTION, getJsonString(org, "description"));
+				        contentValues.put(ContactsContract.CommonDataKinds.Organization.OFFICE_LOCATION, getJsonString(org, "location"));
+				        contentValues.put(ContactsContract.CommonDataKinds.Organization.COMPANY, getJsonString(org, "name"));
+				        contentValues.put(ContactsContract.CommonDataKinds.Organization.TITLE, getJsonString(org, "title"));
+
+					    ops.add(ContentProviderOperation.newInsert(
+					            ContactsContract.Data.CONTENT_URI).withValues(contentValues).build()); 						
+					}
+					// This is an existing organization so do a DB update
+					else {
+						ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
+						        .withSelection(ContactsContract.CommonDataKinds.Organization._ID + "=? AND " + 
+										ContactsContract.Data.MIMETYPE + "=?", 
+										new String[]{orgId, ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE})
+						        .withValue(ContactsContract.CommonDataKinds.Organization.DEPARTMENT, getJsonString(org, "department"))
+						        .withValue(ContactsContract.CommonDataKinds.Organization.JOB_DESCRIPTION, getJsonString(org, "description"))
+						        .withValue(ContactsContract.CommonDataKinds.Organization.OFFICE_LOCATION, getJsonString(org, "location"))
+						        .withValue(ContactsContract.CommonDataKinds.Organization.COMPANY, getJsonString(org, "name"))
+						        .withValue(ContactsContract.CommonDataKinds.Organization.TITLE, getJsonString(org, "title"))
+						        .build());
+					}
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get organizations");
+		}
+
+		// Modify IMs
+		JSONArray ims = null;
+		try {
+			ims = contact.getJSONArray("ims");
+			if (ims != null) {
+				for (int i=0; i<ims.length(); i++) {
+					JSONObject im = (JSONObject)ims.get(i);
+					String imId = getJsonString(im, "id");;
+					// This is a new IM so do a DB insert
+					if (imId==null) {
+						ContentValues contentValues = new ContentValues();
+					    contentValues.put(ContactsContract.Data.RAW_CONTACT_ID, rawId);
+					    contentValues.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE);
+					    contentValues.put(ContactsContract.CommonDataKinds.Im.DATA, getJsonString(im, "value"));
+				        contentValues.put(ContactsContract.CommonDataKinds.Im.TYPE, getContactType(getJsonString(im, "type")));
+
+					    ops.add(ContentProviderOperation.newInsert(
+					            ContactsContract.Data.CONTENT_URI).withValues(contentValues).build()); 						
+					}
+					// This is an existing IM so do a DB update
+					else {
+						ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
+						        .withSelection(ContactsContract.CommonDataKinds.Im._ID + "=? AND " + 
+										ContactsContract.Data.MIMETYPE + "=?", 
+										new String[]{imId, ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE})
+						        .withValue(ContactsContract.CommonDataKinds.Im.DATA, getJsonString(im, "value"))
+						        .withValue(ContactsContract.CommonDataKinds.Im.TYPE, getContactType(getJsonString(im, "type")))
+						        .build());
+					}
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get emails");
+		}
+
+		// Modify note
+		String note = getJsonString(contact, "note");
+		ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
+				.withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " + 
+						ContactsContract.Data.MIMETYPE + "=?", 
+						new String[]{id,ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE})
+		        .withValue(ContactsContract.CommonDataKinds.Note.NOTE, note)
+				.build());
+
+		// Modify nickname
+		String nickname = getJsonString(contact, "nickname");
+		if (nickname != null) {
+			ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
+					.withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " + 
+							ContactsContract.Data.MIMETYPE + "=?", 
+							new String[]{id,ContactsContract.CommonDataKinds.Nickname.CONTENT_ITEM_TYPE})
+			        .withValue(ContactsContract.CommonDataKinds.Nickname.NAME, nickname)
+			        .build());
+		}
+			
+		// Modify urls	
+		JSONArray websites = null;
+		try {
+			websites = contact.getJSONArray("websites");
+			if (websites != null) {
+				for (int i=0; i<websites.length(); i++) {
+					JSONObject website = (JSONObject)websites.get(i);
+					String websiteId = getJsonString(website, "id");;
+					// This is a new website so do a DB insert
+					if (websiteId==null) {
+						ContentValues contentValues = new ContentValues();
+					    contentValues.put(ContactsContract.Data.RAW_CONTACT_ID, rawId);
+					    contentValues.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE);
+					    contentValues.put(ContactsContract.CommonDataKinds.Website.DATA, getJsonString(website, "value"));
+				        contentValues.put(ContactsContract.CommonDataKinds.Website.TYPE, getContactType(getJsonString(website, "type")));
+
+					    ops.add(ContentProviderOperation.newInsert(
+					            ContactsContract.Data.CONTENT_URI).withValues(contentValues).build()); 						
+					}
+					// This is an existing website so do a DB update
+					else {
+						ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
+						        .withSelection(ContactsContract.CommonDataKinds.Website._ID + "=? AND " + 
+										ContactsContract.Data.MIMETYPE + "=?", 
+										new String[]{websiteId, ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE})
+						        .withValue(ContactsContract.CommonDataKinds.Website.DATA, getJsonString(website, "value"))
+						        .withValue(ContactsContract.CommonDataKinds.Website.TYPE, getContactType(getJsonString(website, "type")))
+						        .build());
+					}
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get websites");
+		}
+		
+		// Modify relationships
+		JSONArray relationships = null;
+		try {
+			relationships = contact.getJSONArray("relationships");
+			if (relationships != null) {
+				for (int i=0; i<relationships.length(); i++) {
+					JSONObject relationship = (JSONObject)relationships.get(i);
+					String relationshipId = getJsonString(relationship, "id");;
+					// This is a new relationship so do a DB insert
+					if (relationshipId==null) {
+						ContentValues contentValues = new ContentValues();
+					    contentValues.put(ContactsContract.Data.RAW_CONTACT_ID, rawId);
+					    contentValues.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Relation.CONTENT_ITEM_TYPE);
+					    contentValues.put(ContactsContract.CommonDataKinds.Relation.NAME, getJsonString(relationship, "name"));
+				        contentValues.put(ContactsContract.CommonDataKinds.Relation.TYPE, getRelationshipType(getJsonString(relationship, "type")));
+
+					    ops.add(ContentProviderOperation.newInsert(
+					            ContactsContract.Data.CONTENT_URI).withValues(contentValues).build()); 						
+					}
+					// This is an existing relationship so do a DB update
+					else {
+						ops.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
+						        .withSelection(ContactsContract.CommonDataKinds.Relation._ID + "=? AND " + 
+										ContactsContract.Data.MIMETYPE + "=?", 
+										new String[]{relationshipId, ContactsContract.CommonDataKinds.Relation.CONTENT_ITEM_TYPE})
+						        .withValue(ContactsContract.CommonDataKinds.Relation.NAME, getJsonString(relationship, "value"))
+						        .withValue(ContactsContract.CommonDataKinds.Relation.TYPE, getRelationshipType(getJsonString(relationship, "type")))
+						        .build());
+					}
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get relationships");
+		}
+
+		// Modify birthday
+		String birthday = getJsonString(contact, "birthday");
+		if (birthday != null) {
+			ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+					.withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " + 
+							ContactsContract.Data.MIMETYPE + "=? AND " + 
+							ContactsContract.CommonDataKinds.Event.TYPE + "=?", 
+							new String[]{id,ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE, new String(""+ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY)})
+			        .withValue(ContactsContract.CommonDataKinds.Event.TYPE, ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY)
+			        .withValue(ContactsContract.CommonDataKinds.Event.START_DATE, birthday)
+			        .build());
+		}
+
+		// Modify anniversary
+		String anniversary = getJsonString(contact, "anniversary");
+		if (anniversary != null) {
+			ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+				.withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " + 
+						ContactsContract.Data.MIMETYPE + "=? AND " + 
+						ContactsContract.CommonDataKinds.Event.TYPE + "=?", 
+						new String[]{id,ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE, new String(""+ContactsContract.CommonDataKinds.Event.TYPE_ANNIVERSARY)})
+		        .withValue(ContactsContract.CommonDataKinds.Event.TYPE, ContactsContract.CommonDataKinds.Event.TYPE_ANNIVERSARY)
+		        .withValue(ContactsContract.CommonDataKinds.Event.START_DATE, anniversary)
+		        .build());
+		}
+		
+		boolean retVal = true;
+		
+		//Modify contact
+		try {
+			mApp.getContentResolver().applyBatch(ContactsContract.AUTHORITY, ops);
+		} catch (RemoteException e) {
+			Log.e(LOG_TAG, e.getMessage(), e);
+			Log.e(LOG_TAG, Log.getStackTraceString(e), e);
+			retVal = false;
+		} catch (OperationApplicationException e) {
+			Log.e(LOG_TAG, e.getMessage(), e);
+			Log.e(LOG_TAG, Log.getStackTraceString(e), e);
+			retVal = false;
+		}
+		
+		return retVal;
+	}
+
+	/**
+	 * Add a relationship to a list of database actions to be performed
+	 * 
+	 * @param ops the list of database actions
+	 * @param relationship the item to be inserted
+	 */
+	private void insertRelationship(ArrayList<ContentProviderOperation> ops,
+			JSONObject relationship) {
+		ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+		        .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+		        .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Relation.CONTENT_ITEM_TYPE)
+		        .withValue(ContactsContract.CommonDataKinds.Relation.NAME, getJsonString(relationship, "value"))
+		        .withValue(ContactsContract.CommonDataKinds.Relation.TYPE, getRelationshipType(getJsonString(relationship, "type")))
+		        .build());
+	}
+
+	/**
+	 * Add a website to a list of database actions to be performed
+	 * 
+	 * @param ops the list of database actions
+	 * @param website the item to be inserted
+	 */
+	private void insertWebsite(ArrayList<ContentProviderOperation> ops,
+			JSONObject website) {
+		ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+		        .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+		        .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE)
+		        .withValue(ContactsContract.CommonDataKinds.Website.DATA, getJsonString(website, "value"))
+		        .withValue(ContactsContract.CommonDataKinds.Website.TYPE, getContactType(getJsonString(website, "type")))
+		        .build());
+	}
+
+	/**
+	 * Add an im to a list of database actions to be performed
+	 * 
+	 * @param ops the list of database actions
+	 * @param im the item to be inserted
+	 */
+	private void insertIm(ArrayList<ContentProviderOperation> ops, JSONObject im) {
+		ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+		        .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+		        .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE)
+		        .withValue(ContactsContract.CommonDataKinds.Im.DATA, getJsonString(im, "value"))
+		        .withValue(ContactsContract.CommonDataKinds.Im.TYPE, getContactType(getJsonString(im, "type")))
+		        .build());
+	}
+
+	/**
+	 * Add an organization to a list of database actions to be performed
+	 * 
+	 * @param ops the list of database actions
+	 * @param org the item to be inserted
+	 */
+	private void insertOrganization(ArrayList<ContentProviderOperation> ops,
+			JSONObject org) {
+		ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+		        .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+		        .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE)
+		        .withValue(ContactsContract.CommonDataKinds.Organization.DEPARTMENT, getJsonString(org, "department"))
+		        .withValue(ContactsContract.CommonDataKinds.Organization.JOB_DESCRIPTION, getJsonString(org, "description"))
+		        .withValue(ContactsContract.CommonDataKinds.Organization.OFFICE_LOCATION, getJsonString(org, "location"))
+		        .withValue(ContactsContract.CommonDataKinds.Organization.COMPANY, getJsonString(org, "name"))
+		        .withValue(ContactsContract.CommonDataKinds.Organization.TITLE, getJsonString(org, "title"))
+		        .build());
+	}
+
+	/**
+	 * Add an address to a list of database actions to be performed
+	 * 
+	 * @param ops the list of database actions
+	 * @param address the item to be inserted
+	 */
+	private void insertAddress(ArrayList<ContentProviderOperation> ops,
+			JSONObject address) {
+		ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+		        .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+		        .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE)
+		        .withValue(ContactsContract.CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS, getJsonString(address, "formatted"))
+		        .withValue(ContactsContract.CommonDataKinds.StructuredPostal.STREET, getJsonString(address, "streetAddress"))
+		        .withValue(ContactsContract.CommonDataKinds.StructuredPostal.CITY, getJsonString(address, "locality"))
+		        .withValue(ContactsContract.CommonDataKinds.StructuredPostal.REGION, getJsonString(address, "region"))
+		        .withValue(ContactsContract.CommonDataKinds.StructuredPostal.POSTCODE, getJsonString(address, "postalCode"))
+		        .withValue(ContactsContract.CommonDataKinds.StructuredPostal.COUNTRY, getJsonString(address, "country"))
+		        .build());
+	}
+
+	/**
+	 * Add an email to a list of database actions to be performed
+	 * 
+	 * @param ops the list of database actions
+	 * @param email the item to be inserted
+	 */
+	private void insertEmail(ArrayList<ContentProviderOperation> ops,
+			JSONObject email) {
+		ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+		        .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+		        .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE)
+		        .withValue(ContactsContract.CommonDataKinds.Email.DATA, getJsonString(email, "value"))
+		        .withValue(ContactsContract.CommonDataKinds.Email.TYPE, getPhoneType(getJsonString(email, "type")))
+		        .build());
+	}
+
+	/**
+	 * Add a phone to a list of database actions to be performed
+	 * 
+	 * @param ops the list of database actions
+	 * @param phone the item to be inserted
+	 */
+	private void insertPhone(ArrayList<ContentProviderOperation> ops,
+			JSONObject phone) {
+		ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+		        .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+		        .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE)
+		        .withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, getJsonString(phone, "value"))
+		        .withValue(ContactsContract.CommonDataKinds.Phone.TYPE, getPhoneType(getJsonString(phone, "type")))
+		        .build());
+	}
+
+	/**
+	 * Creates a new contact and stores it in the database
+	 * 
+	 * @param contact the contact to be saved
+	 * @param account the account to be saved under
+	 */
+	private boolean createNewContact(JSONObject contact, Account account) {
+		// Create a list of attributes to add to the contact database
+		ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+
+		//Add contact type
+		ops.add(ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
+		        .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, account.type)
+		        .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, account.name)
+		        .build());
+
+		//Add display name
+		ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+		        .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+		        .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
+		        .withValue(ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME, getJsonString(contact, "displayName"))
+		        .build());
+
+		// Add name
+		ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+		        .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+		        .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
+		        .withValue(ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME, getJsonString(contact, "familyName"))
+		        .withValue(ContactsContract.CommonDataKinds.StructuredName.MIDDLE_NAME, getJsonString(contact, "middleName"))
+		        .withValue(ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME, getJsonString(contact, "givenName"))
+		        .withValue(ContactsContract.CommonDataKinds.StructuredName.PREFIX, getJsonString(contact, "honorificPrefix"))
+		        .withValue(ContactsContract.CommonDataKinds.StructuredName.SUFFIX, getJsonString(contact, "honorificSuffix"))
+		        .build());
+		
+		//Add phone numbers
+		JSONArray phones = null;
+		try {
+			phones = contact.getJSONArray("phoneNumbers");
+			if (phones != null) {
+				for (int i=0; i<phones.length(); i++) {
+					JSONObject phone = (JSONObject)phones.get(i);
+					insertPhone(ops, phone);
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get phone numbers");
+		}
+				
+		// Add emails
+		JSONArray emails = null;
+		try {
+			emails = contact.getJSONArray("emails");
+			if (emails != null) {
+				for (int i=0; i<emails.length(); i++) {
+					JSONObject email = (JSONObject)emails.get(i);
+					insertEmail(ops, email);
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get emails");
+		}
+
+		// Add addresses
+		JSONArray addresses = null;
+		try {
+			addresses = contact.getJSONArray("addresses");
+			if (addresses != null) {
+				for (int i=0; i<addresses.length(); i++) {
+					JSONObject address = (JSONObject)addresses.get(i);
+					insertAddress(ops, address);
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get addresses");
+		}
+
+		// Add organizations
+		JSONArray organizations = null;
+		try {
+			organizations = contact.getJSONArray("organizations");
+			if (organizations != null) {
+				for (int i=0; i<organizations.length(); i++) {
+					JSONObject org = (JSONObject)organizations.get(i);
+					insertOrganization(ops, org);
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get organizations");
+		}
+
+		// Add IMs
+		JSONArray ims = null;
+		try {
+			ims = contact.getJSONArray("ims");
+			if (ims != null) {
+				for (int i=0; i<ims.length(); i++) {
+					JSONObject im = (JSONObject)ims.get(i);
+					insertIm(ops, im);
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get emails");
+		}
+
+		// Add note
+		String note = getJsonString(contact, "note");
+		if (note != null) {
+			ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+			        .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+			        .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE)
+			        .withValue(ContactsContract.CommonDataKinds.Note.NOTE, note)
+			        .build());
+		}
+
+		// Add nickname
+		String nickname = getJsonString(contact, "nickname");
+		if (nickname != null) {
+			ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+			        .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+			        .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Nickname.CONTENT_ITEM_TYPE)
+			        .withValue(ContactsContract.CommonDataKinds.Nickname.NAME, nickname)
+			        .build());
+		}
+		
+		
+		// Add urls	
+		JSONArray websites = null;
+		try {
+			websites = contact.getJSONArray("websites");
+			if (websites != null) {
+				for (int i=0; i<websites.length(); i++) {
+					JSONObject website = (JSONObject)websites.get(i);
+					insertWebsite(ops, website);
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get websites");
+		}
+		
+		// Add relationships
+		JSONArray relationships = null;
+		try {
+			relationships = contact.getJSONArray("relationships");
+			if (relationships != null) {
+				for (int i=0; i<relationships.length(); i++) {
+					JSONObject relationship = (JSONObject)relationships.get(i);
+					insertRelationship(ops, relationship);
+				}
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Could not get relationships");
+		}
+		
+		// Add birthday
+		String birthday = getJsonString(contact, "birthday");
+		if (birthday != null) {
+			ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+			        .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+			        .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE)
+			        .withValue(ContactsContract.CommonDataKinds.Event.TYPE, ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY)
+			        .withValue(ContactsContract.CommonDataKinds.Event.START_DATE, birthday)
+			        .build());
+		}
+
+		// Add anniversary
+		String anniversary = getJsonString(contact, "anniversary");
+		if (anniversary != null) {
+			ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+		        .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+		        .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE)
+		        .withValue(ContactsContract.CommonDataKinds.Event.TYPE, ContactsContract.CommonDataKinds.Event.TYPE_ANNIVERSARY)
+		        .withValue(ContactsContract.CommonDataKinds.Event.START_DATE, anniversary)
+		        .build());
+		}
+
+		boolean retVal = true;
+		//Add contact
+		try {
+			mApp.getContentResolver().applyBatch(ContactsContract.AUTHORITY, ops);
+		} catch (RemoteException e) {
+			Log.e(LOG_TAG, e.getMessage(), e);
+			retVal = false;
+		} catch (OperationApplicationException e) {
+			Log.e(LOG_TAG, e.getMessage(), e);
+			retVal = false;
+		}
+		
+		return retVal;
 	}
 
 	@Override
@@ -629,4 +1393,330 @@ public class ContactAccessorSdk5 extends ContactAccessor {
     			new String[] {id});    	
     	return (result > 0) ? true : false;
 	}	
+
+/**************************************************************************
+ * 	
+ * All methods below this comment are used to convert from JavaScript 
+ * text types to Android integer types and vice versa.
+ * 
+ *************************************************************************/
+	
+	/**
+	 * Converts a string from the W3C Contact API to it's Android int value.
+	 * @param string
+	 * @return Android int value
+	 */
+	private int getPhoneType(String string) {
+		int type = ContactsContract.CommonDataKinds.Phone.TYPE_OTHER;
+		if ("home".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_HOME;
+		}
+		else if ("mobile".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE;
+		}
+		else if ("work".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_WORK;
+		}
+		else if ("work fax".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK;
+		}
+		else if ("home fax".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_FAX_HOME;
+		}
+		else if ("fax".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK;
+		}
+		else if ("pager".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_PAGER;
+		}
+		else if ("other".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_OTHER;
+		}
+		else if ("car".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_CAR;
+		}
+		else if ("company main".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_COMPANY_MAIN;
+		}
+		else if ("isdn".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_ISDN;
+		}
+		else if ("main".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_MAIN;
+		}
+		else if ("other fax".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_OTHER_FAX;
+		}
+		else if ("radio".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_RADIO;
+		}
+		else if ("telex".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_TELEX;
+		}
+		else if ("work mobile".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_WORK_MOBILE;
+		}
+		else if ("work pager".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_WORK_PAGER;
+		}
+		else if ("assistant".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_ASSISTANT;
+		}
+		else if ("mms".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_MMS;
+		}
+		else if ("callback".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_CALLBACK;
+		}
+		else if ("tty ttd".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_TTY_TDD;
+		}
+		else if ("custom".equals(string.toLowerCase())) {
+			return ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM;
+		}
+		return type;
+	}
+
+	/**
+	 * getPhoneType converts an Android phone type into a string
+	 * @param type 
+	 * @return phone type as string.
+	 */
+	private String getPhoneType(int type) {
+		String stringType;
+		switch (type) {
+		case ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM:
+			stringType = "custom";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_FAX_HOME:
+			stringType = "home fax";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK:
+			stringType = "work fax";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_HOME:
+			stringType = "home";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE:
+			stringType = "mobile";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_PAGER:
+			stringType = "pager";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_WORK:
+			stringType = "work";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_CALLBACK:
+			stringType = "callback";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_CAR:
+			stringType = "car";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_COMPANY_MAIN:
+			stringType = "company main";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_OTHER_FAX:
+			stringType = "other fax";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_RADIO:
+			stringType = "radio";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_TELEX:
+			stringType = "telex";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_TTY_TDD:
+			stringType = "tty tdd";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_WORK_MOBILE:
+			stringType = "work mobile";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_WORK_PAGER:
+			stringType = "work pager";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_ASSISTANT:
+			stringType = "assistant";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_MMS:
+			stringType = "mms";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.TYPE_ISDN:
+			stringType = "isdn";
+			break;
+		case ContactsContract.CommonDataKinds.Phone.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 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;
+	}
+
+	/**
+	 * Converts a string from the W3C Contact API to it's Android int value.
+	 * @param string
+	 * @return Android int value
+	 */
+	private int getRelationshipType(String string) {
+		int type = ContactsContract.CommonDataKinds.Relation.TYPE_CUSTOM;
+		if (string!=null) {
+			if ("assistant".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_ASSISTANT;
+			}
+			else if ("brother".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_BROTHER;
+			}
+			else if ("child".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_CHILD;
+			}
+			else if ("domestic partner".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_DOMESTIC_PARTNER;
+			}
+			else if ("father".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_FATHER;
+			}
+			else if ("friend".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_FRIEND;
+			}
+			else if ("manager".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_MANAGER;
+			}
+			else if ("mother".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_MOTHER;
+			}
+			else if ("parent".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_PARENT;
+			}
+			else if ("partner".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_PARTNER;
+			}
+			else if ("referred by".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_REFERRED_BY;
+			}
+			else if ("relative".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_RELATIVE;
+			}
+			else if ("sister".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_SISTER;
+			}
+			else if ("spouse".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_SPOUSE;
+			}
+			else if ("custom".equals(string.toLowerCase())) {
+				return ContactsContract.CommonDataKinds.Relation.TYPE_CUSTOM;
+			}		
+		}
+		return type;
+	}
+
+	/**
+	 * getPhoneType converts an Android phone type into a string
+	 * @param type 
+	 * @return phone type as string.
+	 */
+	private String getRelationshipType(int type) {
+		String stringType;
+		switch (type) {
+			case ContactsContract.CommonDataKinds.Relation.TYPE_ASSISTANT: 
+				stringType = "assistant";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_BROTHER: 
+				stringType = "brother";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_CHILD: 
+				stringType = "child";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_DOMESTIC_PARTNER: 
+				stringType = "domestic partner";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_FATHER: 
+				stringType = "father";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_FRIEND: 
+				stringType = "friend";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_MANAGER: 
+				stringType = "manager";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_MOTHER: 
+				stringType = "mother";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_PARENT: 
+				stringType = "parent";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_PARTNER: 
+				stringType = "partner";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_REFERRED_BY: 
+				stringType = "referred by";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_RELATIVE: 
+				stringType = "relative";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_SISTER: 
+				stringType = "sister";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_SPOUSE: 
+				stringType = "spouse";
+				break;
+			case ContactsContract.CommonDataKinds.Relation.TYPE_CUSTOM: 
+			default: 
+				stringType = "custom";
+				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 30ff5051..e09d3b91 100755
--- a/framework/src/com/phonegap/ContactManager.java
+++ b/framework/src/com/phonegap/ContactManager.java
@@ -46,7 +46,7 @@ public class ContactManager extends Plugin {
 				return new PluginResult(status, res);
 			}
 			else if (action.equals("save")) {
-				// TODO Coming soon!			
+				return new PluginResult(status, contactAccessor.save(args.getJSONObject(0)));
 			}
 			else if (action.equals("remove")) {
 				if (contactAccessor.remove(args.getString(0))) {