rhodes 2.0.0 → 2.0.2

data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java

@@ -0,0 +1,275 @@
+package com.rhomobile.rhodes.phonebook;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.Contacts;
+import android.provider.Contacts.Organizations;
+import android.provider.Contacts.People;
+import android.provider.Contacts.Phones;
+
+import com.rhomobile.rhodes.RhodesInstance;
+
+@SuppressWarnings("deprecation")
+public class ContactAccessorOld implements ContactAccessor {
+	
+	//private static final String TAG = "ContactsAccessorOld";
+	
+	private static final String PB_ID = Phonebook.PB_ID;
+	private static final String PB_FIRST_NAME = Phonebook.PB_FIRST_NAME;
+	private static final String PB_LAST_NAME = Phonebook.PB_LAST_NAME;
+	private static final String PB_MOBILE_NUMBER = Phonebook.PB_MOBILE_NUMBER;
+	private static final String PB_HOME_NUMBER = Phonebook.PB_HOME_NUMBER;
+	private static final String PB_BUSINESS_NUMBER = Phonebook.PB_BUSINESS_NUMBER;
+	private static final String PB_EMAIL_ADDRESS = Phonebook.PB_EMAIL_ADDRESS;
+	private static final String PB_COMPANY_NAME = Phonebook.PB_COMPANY_NAME;
+	
+	private Activity activity;
+	private ContentResolver cr;
+	
+	public ContactAccessorOld() {
+		activity = RhodesInstance.getInstance(); 
+		cr = activity.getContentResolver();
+	}
+	
+	private void fillPhones(String id, Contact contact) {
+		Cursor cursor = cr.query(Contacts.Phones.CONTENT_URI,
+				new String[] {Phones.NUMBER, Phones.TYPE},
+				"person=?", new String[] {id},
+				null);
+
+		try {
+			int numColumn = cursor.getColumnIndex(Phones.NUMBER);
+			int typeColumn = cursor.getColumnIndex(Phones.TYPE);
+			cursor.moveToFirst();
+			for (int i = 0, lim = cursor.getCount(); i < lim; ++i) {
+				switch (cursor.getInt(typeColumn)) {
+				case Phones.TYPE_WORK:
+					contact.setField(PB_BUSINESS_NUMBER, cursor.getString(numColumn));
+					break;
+				case Phones.TYPE_HOME:
+					contact.setField(PB_HOME_NUMBER, cursor.getString(numColumn));
+					break;
+				case Phones.TYPE_MOBILE:
+					contact.setField(PB_MOBILE_NUMBER, cursor.getString(numColumn));
+					break;
+				}
+				cursor.moveToNext();
+			}
+		}
+		finally {
+			cursor.close();
+		}
+	}
+
+	public Map<String, Contact> getAll() throws Exception {
+		Map<String, Contact> contacts = new HashMap<String, Contact>();
+		
+		Cursor cursor = cr.query(People.CONTENT_URI, null, null, null, null);
+		try {
+			if (!cursor.moveToFirst())
+				return contacts;
+			
+			do {
+				Contact contact = new Contact();
+	
+				String id = cursor.getString(cursor.getColumnIndex(People._ID));
+				contact.setId(id);
+	
+				//contact.setField(PB_COMPANY_NAME, cursor.getString(cursor.getColumnIndex(People.COMPANY)));
+	
+				contact.setField(PB_FIRST_NAME, "");
+				contact.setField(PB_LAST_NAME, "");
+				String name = cursor.getString(cursor.getColumnIndex(People.NAME));
+				if (name != null) {
+					String[] names = name.split(" ");
+	
+					if (names.length == 1) {
+						contact.setField(PB_FIRST_NAME, names[0]);
+					}
+					else if (names.length > 1) {
+						contact.setField(PB_FIRST_NAME, names[0]);
+						contact.setField(PB_LAST_NAME, name.replaceFirst(names[0] + " ", ""));
+					}
+				}
+	
+				fillPhones(id, contact);
+	
+				Uri uri = ContentUris.withAppendedId(People.CONTENT_URI,
+						Long.parseLong(contact.id()));
+	
+				Uri orgUri = Uri.withAppendedPath(uri,
+						Contacts.Organizations.CONTENT_DIRECTORY);
+	
+				String[] organizationProjection = new String[] { Organizations.COMPANY };
+				Cursor organizationCursor = activity.managedQuery(orgUri,
+						organizationProjection, "person=?", new String[] {id}, null);
+				try {
+					int organizationCursorCount = organizationCursor.getCount();
+					if (organizationCursorCount > 0) {
+						organizationCursor.moveToFirst();
+						int numberColumn = organizationCursor
+								.getColumnIndex(Organizations.COMPANY);
+		
+						if (numberColumn != -1)
+							contact.setField(PB_COMPANY_NAME,
+									organizationCursor.getString(numberColumn));
+					}
+				}
+				finally {
+					organizationCursor.close();
+				}
+	
+				String[] contactProjection = new String[] {
+						Contacts.ContactMethods.KIND,
+						Contacts.ContactMethods.DATA };
+	
+				Cursor contactCursor = activity.managedQuery(
+						Contacts.ContactMethods.CONTENT_URI,
+						contactProjection, "person=?", new String[] {id}, null);
+				try {
+					int contactCursorCount = contactCursor.getCount();
+					if (contactCursorCount > 0) {
+						contactCursor.moveToFirst();
+						int numberColumn = contactCursor
+								.getColumnIndex(Contacts.ContactMethods.DATA);
+						int typeColumn = contactCursor
+								.getColumnIndex(Contacts.ContactMethods.KIND);
+						for (int j = 0; j < contactCursorCount; j++) {
+							switch (contactCursor.getInt(typeColumn)) {
+							case Contacts.ContactMethods.TYPE_HOME:
+								contact.setField(PB_EMAIL_ADDRESS, contactCursor.getString(numberColumn));
+								break;
+							}
+							contactCursor.moveToNext();
+						}
+					}
+				}
+				finally {
+					contactCursor.close();
+				}
+	
+				contacts.put(contact.getField(PB_ID), contact);
+			} while (cursor.moveToNext());
+		}
+		finally {
+			cursor.close();
+		}
+		
+		return contacts;
+	}
+
+	public void save(Contact contact) throws Exception {
+		String rbID = contact.id();
+		Uri uri = null;
+
+		String firstName = contact.getField(PB_FIRST_NAME);
+		String lastName = contact.getField(PB_LAST_NAME);
+		String name = firstName + " " + lastName;
+
+		boolean isNew = false;
+		if (rbID != null && !"".equals(rbID)) {
+			// update
+			long id = Long.parseLong(rbID);
+			uri = ContentUris.withAppendedId(People.CONTENT_URI, id);
+		}
+		else {
+			// create
+			isNew = true;
+			ContentValues person = new ContentValues();
+			person.put(People.NAME, name);
+
+			uri = cr.insert(People.CONTENT_URI, person);
+		}
+
+		if (uri == null)
+			throw new Exception("Can not save contact");
+		
+		if (!isNew) {
+			ContentValues values = new ContentValues();
+			values.put(People.NAME, name);
+			
+			cr.update(uri, values, null, null);
+		}
+
+		String pathLeaf = (String) uri.getPathSegments().get(
+				uri.getPathSegments().size() - 1);
+
+		contact.setId(pathLeaf);
+
+		String[] phones = {PB_MOBILE_NUMBER, PB_HOME_NUMBER, PB_BUSINESS_NUMBER};
+		int[] types = {Phones.TYPE_MOBILE, Phones.TYPE_HOME, Phones.TYPE_WORK};
+		for (int i = 0; i < phones.length; ++i) {
+			String phName = phones[i];
+			String value = contact.getField(phName);
+			if (value == null)
+				continue;
+			ContentValues number = new ContentValues();
+			number.put(Phones.PERSON_ID, pathLeaf);
+			number.put(Phones.NUMBER, value);
+			number.put(Phones.TYPE, types[i]);
+			
+			Uri phoneUpdate = cr.insert(Phones.CONTENT_URI, number);
+			
+			if (phoneUpdate == null) {
+				int retval = cr.update(People.CONTENT_URI, number, null, null);
+				
+				if (retval == 0)
+					throw new Exception("Failed to insert phone number");
+			}
+		}
+		
+		// add email
+		if (contact.getField(PB_EMAIL_ADDRESS) != null) {
+			ContentValues email = new ContentValues();
+			email.put(Contacts.ContactMethods.PERSON_ID, pathLeaf);
+			email.put(Contacts.ContactMethods.KIND,
+					Contacts.ContactMethods.TYPE_HOME);
+
+			email.put(Contacts.ContactMethods.DATA, contact.getField(PB_EMAIL_ADDRESS));
+
+			email.put(Contacts.ContactMethods.TYPE,
+					Contacts.ContactMethods.CONTENT_EMAIL_ITEM_TYPE);
+
+			Uri emailUpdate = cr.insert(Uri.withAppendedPath(uri,
+							Contacts.ContactMethods.CONTENT_URI.getPath()
+									.substring(1)), email);
+			if (emailUpdate == null) {
+				throw new Exception("Failed to insert primary email");
+			}
+		}
+		// add organization
+		if (contact.getField(PB_COMPANY_NAME) != null) {
+			Uri orgUri = Uri.withAppendedPath(uri,
+					Contacts.Organizations.CONTENT_DIRECTORY);
+
+			ContentValues company = new ContentValues();
+			company.put(Contacts.Organizations.PERSON_ID, pathLeaf);
+			company.put(Contacts.Organizations.TYPE,
+					Contacts.Organizations.TYPE_WORK);
+
+			company.put(Contacts.Organizations.COMPANY, contact
+					.getField(PB_COMPANY_NAME));
+
+			Uri companyUpdate = cr.insert(orgUri, company);
+
+			if (companyUpdate == null) {
+				throw new Exception("Failed to insert company");
+			}
+		}
+	}
+
+	public void remove(Contact contact) {
+		Uri uri = People.CONTENT_URI;
+		
+		String id = contact.id();
+		cr.delete(uri, People._ID + "=" + id, null);
+	}
+
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java

@@ -20,383 +20,186 @@
  */
 package com.rhomobile.rhodes.phonebook;
 
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.Contacts;
-import android.provider.Contacts.Organizations;
-import android.provider.Contacts.People;
-import android.provider.Contacts.Phones;
+import android.os.Build;
 
 import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.RhodesInstance;
 
 //@RubyLevelClass(name="Phonebook")
 public class Phonebook {
 
 	private static final String TAG = "Phonebook";
 	
-	private Map<String, Contact> contactList = new HashMap<String, Contact>();
-	private Activity activity;
-	private ContentResolver cr;
-	private Pattern idPattern;
+	public static final String PB_ID = "id";
+	public static final String PB_FIRST_NAME = "first_name";
+	public static final String PB_LAST_NAME = "last_name";
+	public static final String PB_MOBILE_NUMBER = "mobile_number";
+	public static final String PB_HOME_NUMBER = "home_number";
+	public static final String PB_BUSINESS_NUMBER = "business_number";
+	public static final String PB_EMAIL_ADDRESS = "email_address";
+	public static final String PB_COMPANY_NAME = "company_name";
 	
+	private Map<String, Contact> contactList;
+	private ContactAccessor accessor;
 	private Iterator<Contact> iter = null;
 
-	static final String PB_ID = "id";
-	static final String PB_FIRST_NAME = "first_name";
-	static final String PB_LAST_NAME = "last_name";
-	static final String PB_MOBILE_NUMBER = "mobile_number";
-	static final String PB_HOME_NUMBER = "home_number";
-	static final String PB_BUSINESS_NUMBER = "business_number";
-	static final String PB_EMAIL_ADDRESS = "email_address";
-	static final String PB_COMPANY_NAME = "company_name";
-	
-	private String getId(Contact contact) {
-		Matcher m = idPattern.matcher(contact.getField(PB_ID));
-		return m.find() ? m.group(1) : "";
-	}
-	
 	private boolean checkState() {
 		if (!Capabilities.PIM_ENABLED)
 			Logger.E(TAG, "Can not execute: PIM disabled");
 		return Capabilities.PIM_ENABLED;
 	}
 	
-	public Phonebook() {
-		if (!checkState())
-			return;
+	private ContactAccessor createAccessor() {
+		String className;
+		int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
+		if (sdkVersion < Build.VERSION_CODES.ECLAIR)
+			className = "ContactAccessorOld";
+		else
+			className = "ContactAccessorNew";
 		
-		fill();
+		try {
+			String fullName = "com.rhomobile.rhodes.phonebook." + className;
+			Class<? extends ContactAccessor> klass =
+				Class.forName(fullName).asSubclass(ContactAccessor.class);
+			return klass.newInstance();
+		}
+		catch (Exception e) {
+			throw new IllegalStateException(e);
+		}
 	}
 	
-	private void fill() {
-
-		idPattern = Pattern.compile("\\{([0-9]+)\\}");
-		activity = RhodesInstance.getInstance(); 
-		cr = activity.getContentResolver();
-		Cursor cursor = cr.query(People.CONTENT_URI, null, null, null, null);
-
-		// load contacts
-
-		if (cursor.moveToFirst()) {
-			do {
-				Contact contact = new Contact();
-
-				contact.setField(PB_ID, "{" + cursor.getString(cursor.getColumnIndex(People._ID)) + "}");
-
-				//contact.setField(PB_COMPANY_NAME, cursor.getString(cursor.getColumnIndex(People.COMPANY)));
-
-				String name = cursor.getString(cursor
-						.getColumnIndex(People.NAME));
-
-				contact.setField(PB_FIRST_NAME, "");
-				contact.setField(PB_LAST_NAME, "");
-				
-				if (name != null) {
-					String[] names = name.split(" ");
-
-					if (names.length == 1) {
-						contact.setField(PB_FIRST_NAME, names[0]);
-					}
-					else if (names.length > 1) {
-						contact.setField(PB_FIRST_NAME, names[0]);
-						contact.setField(PB_LAST_NAME, name.replaceFirst(names[0] + " ", ""));
-					}
-				}
-
-				long personId = cursor.getLong(cursor
-						.getColumnIndex(People._ID));
-
-				String whereClause = "person=" + personId;
-
-				String[] phonesProjection = new String[] { Phones.NUMBER,
-						Phones.TYPE };
-				Cursor phonesCursor = activity.managedQuery(
-						Contacts.Phones.CONTENT_URI, phonesProjection,
-						whereClause, null, null);
-
-				int phonesCursorCount = phonesCursor.getCount();
-				if (phonesCursorCount > 0) {
-					phonesCursor.moveToFirst();
-					int numberColumn = phonesCursor
-							.getColumnIndex(Phones.NUMBER);
-					int typeColumn = phonesCursor
-							.getColumnIndex(Phones.TYPE);
-					for (int j = 0; j < phonesCursorCount; j++) {
-						switch (phonesCursor.getInt(typeColumn)) {
-						case Phones.TYPE_WORK:
-							contact.setField(PB_BUSINESS_NUMBER, phonesCursor.getString(numberColumn));
-							break;
-						case Phones.TYPE_HOME:
-							contact.setField(PB_HOME_NUMBER, phonesCursor.getString(numberColumn));
-							break;
-						case Phones.TYPE_MOBILE:
-							contact.setField(PB_MOBILE_NUMBER, phonesCursor.getString(numberColumn));
-							break;
-						}
-						phonesCursor.moveToNext();
-					}
-				}
-				
-				phonesCursor.close();
-
-				Uri uri = ContentUris.withAppendedId(People.CONTENT_URI,
-						Long.parseLong(getId(contact)));
-
-				Uri orgUri = Uri.withAppendedPath(uri,
-						Contacts.Organizations.CONTENT_DIRECTORY);
-
-				String[] organizationProjection = new String[] { Organizations.COMPANY };
-				Cursor organizationCursor = activity.managedQuery(orgUri,
-						organizationProjection, whereClause, null, null);
-
-				int organizationCursorCount = organizationCursor.getCount();
-				if (organizationCursorCount > 0) {
-					organizationCursor.moveToFirst();
-					int numberColumn = organizationCursor
-							.getColumnIndex(Organizations.COMPANY);
-
-					if (numberColumn != -1)
-						contact.setField(PB_COMPANY_NAME,
-								organizationCursor.getString(numberColumn));
-				}
-				
-				organizationCursor.close();
-
-				String[] contactProjection = new String[] {
-						Contacts.ContactMethods.KIND,
-						Contacts.ContactMethods.DATA };
-
-				Cursor contactCursor = activity.managedQuery(
-						Contacts.ContactMethods.CONTENT_URI,
-						contactProjection, whereClause, null, null);
-
-				int contactCursorCount = contactCursor.getCount();
-				if (contactCursorCount > 0) {
-					contactCursor.moveToFirst();
-					int numberColumn = contactCursor
-							.getColumnIndex(Contacts.ContactMethods.DATA);
-					int typeColumn = contactCursor
-							.getColumnIndex(Contacts.ContactMethods.KIND);
-					for (int j = 0; j < contactCursorCount; j++) {
-						switch (contactCursor.getInt(typeColumn)) {
-						case Contacts.ContactMethods.TYPE_HOME:
-							contact.setField(PB_EMAIL_ADDRESS, contactCursor.getString(numberColumn));
-							break;
-						}
-						contactCursor.moveToNext();
-					}
-				}
-				
-				contactCursor.close();
-
-				this.contactList.put(contact.getField(PB_ID), contact);
-			} while (cursor.moveToNext());
+	public Phonebook() {
+		try {
+			if (!checkState())
+				return;
+			
+			accessor = createAccessor();
+			contactList = accessor.getAll();
+			moveToBegin();
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
 		}
-		
-		cursor.close();
-		
-		moveToBegin();
 	}
-
+	
 	public void close() {
-		if (!checkState())
-			return;
-		
-		this.contactList.clear();
+		try {
+			if (!checkState())
+				return;
+			
+			this.contactList.clear();
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
+		}
 	}
 	
 	public void moveToBegin() {
-		if (!checkState())
-			return;
-		
-		iter = contactList.values().iterator();
+		try {
+			if (!checkState())
+				return;
+			
+			iter = contactList.values().iterator();
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
+		}
 	}
 	
 	public boolean hasNext() {
-		if (!checkState())
+		try {
+			if (!checkState())
+				return false;
+			
+			return iter.hasNext();
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
 			return false;
-		
-		return iter.hasNext();
+		}
 	}
 	
 	public Object next() {
-		if (!checkState())
+		try {
+			if (!checkState())
+				return null;
+			
+			return iter.next();
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
 			return null;
-		
-		return iter.next();
+		}
 	}
 	
 	public Contact getFirstRecord() {
-		if (!checkState())
-			return null;
-		
-		moveToBegin();
-		if (!iter.hasNext())
+		try {
+			if (!checkState())
+				return null;
+			
+			moveToBegin();
+			if (!iter.hasNext())
+				return null;
+			return iter.next();
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
 			return null;
-		return iter.next();
+		}
 	}
 	
 	public Contact getNextRecord() {
-		if (!checkState())
+		try {
+			if (!checkState())
+				return null;
+			
+			return iter.next();
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
 			return null;
-		
-		return iter.next();
+		}
 	}
 	
 	public Contact getRecord(String id) {
-		if (!checkState())
+		try {
+			if (!checkState())
+				return null;
+			
+			return contactList.get(id);
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
 			return null;
-		
-		return contactList.get(id);
+		}
 	}
 
-	public void removeContact(Contact contact) throws Exception {
-		if (!checkState())
-			return;
-		
-		Uri uri = People.CONTENT_URI;
-
-		String id = getId(contact);
-		cr.delete(uri, People._ID + "=" + id, null);
+	public void removeContact(Contact contact) {
+		try {
+			if (!checkState())
+				return;
+			
+			accessor.remove(contact);
+			contactList.remove(contact.getField(PB_ID));
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
+		}
 	}
 
-	public void saveContact(Contact contact) throws Exception {
-		if (!checkState())
-			return;
-		
-		String rbID = getId(contact);
-		Uri uri = null;
-
-		String name = contact.getField(PB_FIRST_NAME) + " "
-				+ contact.getField(PB_LAST_NAME);
-
-		boolean isNew = false;
-		if (rbID != null && !"".equals(rbID))// update
-		{
-			uri = ContentUris.withAppendedId(People.CONTENT_URI, Long.parseLong(rbID));
-		} else // create
-		{
-			isNew = true;
-			ContentValues person = new ContentValues();
-			person.put(Contacts.People.NAME, name);
-
-			uri = cr.insert(Contacts.People.CONTENT_URI, person);
+	public void saveContact(Contact contact) {
+		try {
+			if (!checkState())
+				return;
+			
+			accessor.save(contact);
+			contactList.put(contact.getField(PB_ID), contact);
 		}
-
-		if (uri != null) {
-
-			if (!isNew) {
-				ContentValues values = new ContentValues();
-				values.put(People.NAME, name);
-
-				activity.getContentResolver().update(uri, values, null, null);
-			}
-
-			String pathLeaf = (String) uri.getPathSegments().get(
-					uri.getPathSegments().size() - 1);
-
-			contact.setField(PB_ID, "{" + pathLeaf + "}");
-
-			// add mobile phone number
-
-			if (!contact.getField(PB_MOBILE_NUMBER).equals("")) {
-				ContentValues number = new ContentValues();
-				number.put(Contacts.Phones.PERSON_ID, pathLeaf);
-				number.put(Contacts.Phones.NUMBER, contact.getField(PB_MOBILE_NUMBER));
-				number.put(Contacts.Phones.TYPE, Contacts.Phones.TYPE_MOBILE);
-
-				Uri phoneUpdate = cr.insert(Contacts.Phones.CONTENT_URI, number);
-
-				if (phoneUpdate == null) {
-					int retval = cr.update(People.CONTENT_URI, number, null, null);
-
-					if (retval == 0)
-						throw new Exception("Failed to insert mobile number");
-				}
-			}
-
-			// add home phone number
-			if (!contact.getField(PB_HOME_NUMBER).equals("")) {
-				ContentValues home = new ContentValues();
-				home.put(Contacts.Phones.PERSON_ID, pathLeaf);
-				home.put(Contacts.Phones.NUMBER, contact.getField(PB_HOME_NUMBER));
-				home.put(Contacts.Phones.TYPE, Contacts.Phones.TYPE_HOME);
-
-				Uri homeUpdate = cr.insert(Contacts.Phones.CONTENT_URI, home);
-
-				if (homeUpdate == null) {
-					int retval = cr.update(People.CONTENT_URI, home, null, null);
-
-					if (retval == 0)
-						throw new Exception("Failed to insert home number");
-				}
-			}
-			// add work phone number
-			if (!contact.getField(PB_BUSINESS_NUMBER).equals("")) {
-				ContentValues work = new ContentValues();
-				work.put(Contacts.Phones.PERSON_ID, pathLeaf);
-				work.put(Contacts.Phones.NUMBER, contact.getField(PB_BUSINESS_NUMBER));
-				work.put(Contacts.Phones.TYPE, Contacts.Phones.TYPE_WORK);
-
-				Uri workUpdate = cr.insert(Contacts.Phones.CONTENT_URI, work);
-
-				if (workUpdate == null) {
-					int retval = cr.update(People.CONTENT_URI, work, null, null);
-
-					if (retval == 0)
-						throw new Exception("Failed to insert work number");
-				}
-			}
-			// add email
-			if (!contact.getField(PB_EMAIL_ADDRESS).equals("")) {
-				ContentValues email = new ContentValues();
-				email.put(Contacts.ContactMethods.PERSON_ID, pathLeaf);
-				email.put(Contacts.ContactMethods.KIND,
-						Contacts.ContactMethods.TYPE_HOME);
-
-				email.put(Contacts.ContactMethods.DATA, contact.getField(PB_EMAIL_ADDRESS));
-
-				email.put(Contacts.ContactMethods.TYPE,
-						Contacts.ContactMethods.CONTENT_EMAIL_ITEM_TYPE);
-
-				Uri emailUpdate = cr.insert(Uri.withAppendedPath(uri,
-								Contacts.ContactMethods.CONTENT_URI.getPath()
-										.substring(1)), email);
-				if (emailUpdate == null) {
-					throw new Exception("Failed to insert primary email");
-				}
-			}
-			// add organization
-			if (!contact.getField(PB_COMPANY_NAME).equals("")) {
-				Uri orgUri = Uri.withAppendedPath(uri,
-						Contacts.Organizations.CONTENT_DIRECTORY);
-
-				ContentValues company = new ContentValues();
-				company.put(Contacts.Organizations.PERSON_ID, pathLeaf);
-				company.put(Contacts.Organizations.TYPE,
-						Contacts.Organizations.TYPE_WORK);
-
-				company.put(Contacts.Organizations.COMPANY, contact
-						.getField(PB_COMPANY_NAME));
-
-				Uri companyUpdate = cr.insert(orgUri, company);
-
-				if (companyUpdate == null) {
-					throw new Exception("Failed to insert company");
-				}
-			}
+		catch (Exception e) {
+			Logger.E(TAG, e);
 		}
 	}