rhodes 2.2.4.beta.1 → 2.2.5.beta.1

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

@@ -3,6 +3,7 @@ package com.rhomobile.rhodes.phonebook;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesService;
 
 import android.accounts.Account;
@@ -22,8 +23,10 @@ import android.provider.ContactsContract.RawContacts;
 
 public class ContactAccessorNew implements ContactAccessor {
 	
-	//private static final String TAG = "ContactsAccessorNew";
+	private static final String TAG = "ContactsAccessorNew";
+	private static final boolean logging_enable = false;
 	
+	/*
 	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;
@@ -32,11 +35,14 @@ public class ContactAccessorNew implements ContactAccessor {
 	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 ContentResolver cr;
 	private String accName;
 	private String accType;
 	
+	
+	
 	public ContactAccessorNew() throws Exception {
 		Context ctx = RhodesService.getInstance().getContext();
 		
@@ -54,9 +60,10 @@ public class ContactAccessorNew implements ContactAccessor {
 		cr = ctx.getContentResolver();
 	}
 	
-	private void fillName(String id, Contact contact) {
-		contact.setField(PB_FIRST_NAME, "");
-		contact.setField(PB_LAST_NAME, "");
+	public void fillName(String id, Contact contact) {
+		if (logging_enable) Logger.I(TAG, "fillName("+id+")");
+		contact.setFieldInner(Phonebook.PB_I_FIRST_NAME, "");
+		contact.setFieldInner(Phonebook.PB_I_LAST_NAME, "");
 		
 		Cursor cursor = cr.query(Data.CONTENT_URI,
 				new String[] {StructuredName.DISPLAY_NAME},
@@ -64,27 +71,34 @@ public class ContactAccessorNew implements ContactAccessor {
 				new String[] {id, StructuredName.CONTENT_ITEM_TYPE},
 				null);
 		try {
-			if (!cursor.moveToFirst())
+			if (!cursor.moveToFirst()) {
+				if (logging_enable) Logger.I(TAG, "fillName() not found record with ID");
 				return;
+			}
 			
 			String name = cursor.getString(cursor.getColumnIndex(StructuredName.DISPLAY_NAME));
 			if (name != null) {
 				String[] names = name.split(" ");
+				if (logging_enable) Logger.I(TAG, "fillName() names = "+name);
 				if (names.length == 1) {
-					contact.setField(PB_FIRST_NAME, name);
+					contact.setFieldInner(Phonebook.PB_I_FIRST_NAME, name);
 				}
-				else {
-					contact.setField(PB_FIRST_NAME, names[0]);
-					contact.setField(PB_LAST_NAME, names[1]);
+				else if (names.length > 1) {
+					contact.setFieldInner(Phonebook.PB_I_FIRST_NAME, names[0]);
+					contact.setFieldInner(Phonebook.PB_I_LAST_NAME, names[1]);
 				}
 			}
+			else {
+				if (logging_enable) Logger.I(TAG, "fillName() name == NULL");
+				
+			}
 		}
 		finally {
 			cursor.close();
 		}
 	}
 	
-	private void fillPhones(String id, Contact contact) {
+	public void fillPhones(String id, Contact contact) {
 		Cursor cursor = cr.query(Data.CONTENT_URI,
 				new String[] {Phone.NUMBER, Phone.TYPE},
 				Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + "=?",
@@ -99,13 +113,13 @@ public class ContactAccessorNew implements ContactAccessor {
 			do {
 				switch (cursor.getInt(typeColumn)) {
 				case Phone.TYPE_HOME:
-					contact.setField(PB_HOME_NUMBER, cursor.getString(numColumn));
+					contact.setFieldInner(Phonebook.PB_I_HOME_NUMBER, cursor.getString(numColumn));
 					break;
 				case Phone.TYPE_WORK:
-					contact.setField(PB_BUSINESS_NUMBER, cursor.getString(numColumn));
+					contact.setFieldInner(Phonebook.PB_I_BUSINESS_NUMBER, cursor.getString(numColumn));
 					break;
 				case Phone.TYPE_MOBILE:
-					contact.setField(PB_MOBILE_NUMBER, cursor.getString(numColumn));
+					contact.setFieldInner(Phonebook.PB_I_MOBILE_NUMBER, cursor.getString(numColumn));
 					break;
 				}
 			} while (cursor.moveToNext());
@@ -115,7 +129,7 @@ public class ContactAccessorNew implements ContactAccessor {
 		}
 	}
 	
-	private void fillEmails(String id, Contact contact) {
+	public void fillEmails(String id, Contact contact) {
 		Cursor cursor = cr.query(Data.CONTENT_URI,
 				new String[] {Email.DATA},
 				Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + "=?",
@@ -126,14 +140,14 @@ public class ContactAccessorNew implements ContactAccessor {
 				return;
 			
 			String data = cursor.getString(cursor.getColumnIndex(Email.DATA));
-			contact.setField(PB_EMAIL_ADDRESS, data);
+			contact.setFieldInner(Phonebook.PB_I_EMAIL_ADDRESS, data);
 		}
 		finally {
 			cursor.close();
 		}
 	}
 	
-	private void fillCompany(String id, Contact contact) {
+	public void fillCompany(String id, Contact contact) {
 		Cursor cursor = cr.query(Data.CONTENT_URI,
 				new String[] {Organization.COMPANY},
 				Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + "=?",
@@ -143,7 +157,7 @@ public class ContactAccessorNew implements ContactAccessor {
 			if (!cursor.moveToFirst())
 				return;
 			String company = cursor.getString(cursor.getColumnIndex(Organization.COMPANY));
-			contact.setField(PB_COMPANY_NAME, company);
+			contact.setFieldInner(Phonebook.PB_I_COMPANY_NAME, company);
 		}
 		finally {
 			cursor.close();
@@ -162,6 +176,7 @@ public class ContactAccessorNew implements ContactAccessor {
 			
 			do {
 				Contact contact = new Contact();
+				contact.setAccessor(this);
 				
 				String id = cursor.getString(cursor.getColumnIndex(RawContacts._ID));
 				contact.setId(id);
@@ -170,8 +185,9 @@ public class ContactAccessorNew implements ContactAccessor {
 				fillPhones(id, contact);
 				fillEmails(id, contact);
 				fillCompany(id, contact);
+				contact.makeAllFilled();
 				
-				contacts.put(contact.getField(PB_ID), contact);
+				contacts.put(contact.getField(Phonebook.PB_I_ID), contact);
 			} while (cursor.moveToNext());
 		}
 		finally {
@@ -181,6 +197,35 @@ public class ContactAccessorNew implements ContactAccessor {
 		return contacts;
 	}
 	
+	public Contact getContactByID(String id) {
+		if (logging_enable) Logger.I(TAG, "getContactByID("+id+")");
+		
+		Contact contact = null; 
+		
+		Cursor cursor = cr.query(Data.CONTENT_URI,
+				new String[] {RawContacts._ID},
+				Data.RAW_CONTACT_ID + "=?",
+				new String[] {id},
+				null);		
+		
+		try {
+			if (!cursor.moveToFirst()) {
+				if (logging_enable) Logger.I(TAG, "getContactByID() not found");
+				return null;
+			}
+			contact = new Contact();
+			contact.setAccessor(this);
+			
+			//String idd = cursor.getString(cursor.getColumnIndex(RawContacts._ID));
+			contact.setId(id);
+		}
+		finally {
+			cursor.close();
+		}
+		if (logging_enable) Logger.I(TAG, "getContactByID() found");
+		return contact;
+	}
+	
 	private void create(Contact contact) throws Exception {
 		String id = contact.id();
 		
@@ -192,6 +237,8 @@ public class ContactAccessorNew implements ContactAccessor {
 			Uri uri = cr.insert(RawContacts.CONTENT_URI, values);
 			id = String.valueOf(ContentUris.parseId(uri));
 			contact.setId(id);
+			contact.setAccessor(this);
+			contact.makeAllFilled();
 		}
 	}
 	
@@ -240,8 +287,8 @@ public class ContactAccessorNew implements ContactAccessor {
 	}
 	
 	private void updateName(Contact contact) throws Exception {
-		String firstName = contact.getField(PB_FIRST_NAME);
-		String lastName = contact.getField(PB_LAST_NAME);
+		String firstName = contact.getField(Phonebook.PB_I_FIRST_NAME);
+		String lastName = contact.getField(Phonebook.PB_I_LAST_NAME);
 
 		ContentValues values = new ContentValues();
 		values.put(Data.MIMETYPE, StructuredName.CONTENT_ITEM_TYPE);
@@ -252,11 +299,11 @@ public class ContactAccessorNew implements ContactAccessor {
 	}
 	
 	private void updatePhones(Contact contact) throws Exception {
-		String[] phones = {PB_MOBILE_NUMBER, PB_HOME_NUMBER, PB_BUSINESS_NUMBER};
+		int[] phones = {Phonebook.PB_I_MOBILE_NUMBER, Phonebook.PB_I_HOME_NUMBER, Phonebook.PB_I_BUSINESS_NUMBER};
 		int[] types = {Phone.TYPE_MOBILE, Phone.TYPE_HOME, Phone.TYPE_WORK};
 		
 		for (int i = 0; i < phones.length; ++i) {
-			String phName = phones[i];
+			int phName = phones[i];
 			String value = contact.getField(phName);
 			if (value == null || value.length() == 0)
 				continue;
@@ -270,7 +317,7 @@ public class ContactAccessorNew implements ContactAccessor {
 	}
 	
 	private void updateEmails(Contact contact) throws Exception {
-		String value = contact.getField(PB_EMAIL_ADDRESS);
+		String value = contact.getField(Phonebook.PB_I_EMAIL_ADDRESS);
 		if (value == null || value.length() == 0)
 			return;
 		
@@ -281,7 +328,7 @@ public class ContactAccessorNew implements ContactAccessor {
 	}
 	
 	private void updateCompany(Contact contact) throws Exception {
-		String value = contact.getField(PB_COMPANY_NAME);
+		String value = contact.getField(Phonebook.PB_I_COMPANY_NAME);
 		if (value == null || value.length() == 0)
 			return;
 		
@@ -298,6 +345,7 @@ public class ContactAccessorNew implements ContactAccessor {
 		updatePhones(contact);
 		updateEmails(contact);
 		updateCompany(contact);
+		contact.makeAllFilled();
 	}
 	
 	public void remove(Contact contact) {

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

@@ -20,6 +20,7 @@ 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;
@@ -28,7 +29,7 @@ public class ContactAccessorOld implements ContactAccessor {
 	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 ContentResolver cr;
 	
 	public ContactAccessorOld() {
@@ -48,13 +49,13 @@ public class ContactAccessorOld implements ContactAccessor {
 			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));
+					contact.setFieldInner(Phonebook.PB_I_BUSINESS_NUMBER, cursor.getString(numColumn));
 					break;
 				case Phones.TYPE_HOME:
-					contact.setField(PB_HOME_NUMBER, cursor.getString(numColumn));
+					contact.setFieldInner(Phonebook.PB_I_HOME_NUMBER, cursor.getString(numColumn));
 					break;
 				case Phones.TYPE_MOBILE:
-					contact.setField(PB_MOBILE_NUMBER, cursor.getString(numColumn));
+					contact.setFieldInner(Phonebook.PB_I_MOBILE_NUMBER, cursor.getString(numColumn));
 					break;
 				}
 				cursor.moveToNext();
@@ -81,18 +82,18 @@ public class ContactAccessorOld implements ContactAccessor {
 	
 				//contact.setField(PB_COMPANY_NAME, cursor.getString(cursor.getColumnIndex(People.COMPANY)));
 	
-				contact.setField(PB_FIRST_NAME, "");
-				contact.setField(PB_LAST_NAME, "");
+				contact.setFieldInner(Phonebook.PB_I_FIRST_NAME, "");
+				contact.setFieldInner(Phonebook.PB_I_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]);
+						contact.setFieldInner(Phonebook.PB_I_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] + " ", ""));
+						contact.setFieldInner(Phonebook.PB_I_FIRST_NAME, names[0]);
+						contact.setFieldInner(Phonebook.PB_I_LAST_NAME, name.replaceFirst(names[0] + " ", ""));
 					}
 				}
 	
@@ -115,7 +116,7 @@ public class ContactAccessorOld implements ContactAccessor {
 								.getColumnIndex(Organizations.COMPANY);
 		
 						if (numberColumn != -1)
-							contact.setField(PB_COMPANY_NAME,
+							contact.setFieldInner(Phonebook.PB_I_COMPANY_NAME,
 									organizationCursor.getString(numberColumn));
 					}
 				}
@@ -141,7 +142,7 @@ public class ContactAccessorOld implements ContactAccessor {
 						for (int j = 0; j < contactCursorCount; j++) {
 							switch (contactCursor.getInt(typeColumn)) {
 							case Contacts.ContactMethods.TYPE_HOME:
-								contact.setField(PB_EMAIL_ADDRESS, contactCursor.getString(numberColumn));
+								contact.setFieldInner(Phonebook.PB_I_EMAIL_ADDRESS, contactCursor.getString(numberColumn));
 								break;
 							}
 							contactCursor.moveToNext();
@@ -151,8 +152,8 @@ public class ContactAccessorOld implements ContactAccessor {
 				finally {
 					contactCursor.close();
 				}
-	
-				contacts.put(contact.getField(PB_ID), contact);
+				contact.makeAllFilled();
+				contacts.put(contact.getField(Phonebook.PB_I_ID), contact);
 			} while (cursor.moveToNext());
 		}
 		finally {
@@ -166,8 +167,8 @@ public class ContactAccessorOld implements ContactAccessor {
 		String rbID = contact.id();
 		Uri uri = null;
 
-		String firstName = contact.getField(PB_FIRST_NAME);
-		String lastName = contact.getField(PB_LAST_NAME);
+		String firstName = contact.getField(Phonebook.PB_I_FIRST_NAME);
+		String lastName = contact.getField(Phonebook.PB_I_LAST_NAME);
 		String name = firstName + " " + lastName;
 
 		boolean isNew = false;
@@ -200,10 +201,10 @@ public class ContactAccessorOld implements ContactAccessor {
 
 		contact.setId(pathLeaf);
 
-		String[] phones = {PB_MOBILE_NUMBER, PB_HOME_NUMBER, PB_BUSINESS_NUMBER};
+		int[] phones = {Phonebook.PB_I_MOBILE_NUMBER, Phonebook.PB_I_HOME_NUMBER, Phonebook.PB_I_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];
+			int phName = phones[i];
 			String value = contact.getField(phName);
 			if (value == null)
 				continue;
@@ -223,13 +224,13 @@ public class ContactAccessorOld implements ContactAccessor {
 		}
 		
 		// add email
-		if (contact.getField(PB_EMAIL_ADDRESS) != null) {
+		if (contact.getField(Phonebook.PB_I_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.DATA, contact.getField(Phonebook.PB_I_EMAIL_ADDRESS));
 
 			email.put(Contacts.ContactMethods.TYPE,
 					Contacts.ContactMethods.CONTENT_EMAIL_ITEM_TYPE);
@@ -242,7 +243,7 @@ public class ContactAccessorOld implements ContactAccessor {
 			}
 		}
 		// add organization
-		if (contact.getField(PB_COMPANY_NAME) != null) {
+		if (contact.getField(Phonebook.PB_I_COMPANY_NAME) != null) {
 			Uri orgUri = Uri.withAppendedPath(uri,
 					Contacts.Organizations.CONTENT_DIRECTORY);
 
@@ -252,7 +253,7 @@ public class ContactAccessorOld implements ContactAccessor {
 					Contacts.Organizations.TYPE_WORK);
 
 			company.put(Contacts.Organizations.COMPANY, contact
-					.getField(PB_COMPANY_NAME));
+					.getField(Phonebook.PB_I_COMPANY_NAME));
 
 			Uri companyUpdate = cr.insert(orgUri, company);
 

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

@@ -20,6 +20,7 @@
  */
 package com.rhomobile.rhodes.phonebook;
 
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -32,6 +33,7 @@ import com.rhomobile.rhodes.Logger;
 public class Phonebook {
 
 	private static final String TAG = "Phonebook";
+	private static final boolean logging_enable = false;
 	
 	public static final String PB_ID = "id";
 	public static final String PB_FIRST_NAME = "first_name";
@@ -42,9 +44,24 @@ public class Phonebook {
 	public static final String PB_EMAIL_ADDRESS = "email_address";
 	public static final String PB_COMPANY_NAME = "company_name";
 	
+	public static final int PB_FIELDS_COUNT = 8;
+	public static final int PB_I_ID = 0;
+	public static final int PB_I_FIRST_NAME = 1;
+	public static final int PB_I_LAST_NAME = 2;
+	public static final int PB_I_MOBILE_NUMBER = 3;
+	public static final int PB_I_HOME_NUMBER = 4;
+	public static final int PB_I_BUSINESS_NUMBER = 5;
+	public static final int PB_I_EMAIL_ADDRESS = 6;
+	public static final int PB_I_COMPANY_NAME = 7;
+	
+	
+	
+	
+	
 	private Map<String, Contact> contactList;
 	private ContactAccessor accessor;
 	private Iterator<Contact> iter = null;
+	private boolean mIsFullListReceived = false;
 
 	private boolean checkState() {
 		if (!Capabilities.PIM_ENABLED)
@@ -78,8 +95,23 @@ public class Phonebook {
 				return;
 			
 			accessor = createAccessor();
-			contactList = accessor.getAll();
-			moveToBegin();
+			contactList = new HashMap<String, Contact>();
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
+		}
+	}
+	
+	public void prepareFullList() {
+		if (!checkState())
+			return;
+		try {
+			if (!mIsFullListReceived) {
+				Logger.I(TAG, "Phonebook.prepareFullList()");
+				contactList = accessor.getAll();
+				mIsFullListReceived = true;
+			}
+			//moveToBegin();
 		}
 		catch (Exception e) {
 			Logger.E(TAG, e);
@@ -97,12 +129,14 @@ public class Phonebook {
 			Logger.E(TAG, e);
 		}
 	}
-	
+
 	public void moveToBegin() {
 		try {
 			if (!checkState())
 				return;
-			
+			if (!mIsFullListReceived) {
+				prepareFullList();
+			}	
 			iter = contactList.values().iterator();
 		}
 		catch (Exception e) {
@@ -114,6 +148,9 @@ public class Phonebook {
 		try {
 			if (!checkState())
 				return false;
+			//if (!mIsFullListReceived) {
+			//	prepareFullList();
+			//}	
 			
 			return iter.hasNext();
 		}
@@ -127,6 +164,9 @@ public class Phonebook {
 		try {
 			if (!checkState())
 				return null;
+			//if (!mIsFullListReceived) {
+			//	prepareFullList();
+			//}	
 			
 			return iter.next();
 		}
@@ -140,6 +180,9 @@ public class Phonebook {
 		try {
 			if (!checkState())
 				return null;
+			//if (!mIsFullListReceived) {
+			//	prepareFullList();
+			//}	
 			
 			moveToBegin();
 			if (!iter.hasNext())
@@ -156,6 +199,9 @@ public class Phonebook {
 		try {
 			if (!checkState())
 				return null;
+			//if (!mIsFullListReceived) {
+			//	prepareFullList();
+			//}	
 			
 			return iter.next();
 		}
@@ -165,12 +211,46 @@ public class Phonebook {
 		}
 	}
 	
-	public Contact getRecord(String id) {
+	public Contact getRecord(String idd) {
+		if (logging_enable) Logger.I(TAG, "Phonebook.getRecord("+idd+")");
 		try {
-			if (!checkState())
-				return null;
-			
-			return contactList.get(id);
+			//if (!checkState())
+			//	return null;
+			if (contactList == null) {
+				if (logging_enable) Logger.I(TAG, "Phonebook.getRecord() contackList is null !");
+			}
+			if ((accessor != null) && (accessor instanceof ContactAccessorNew)) {
+			//if (false) {
+				if (logging_enable) Logger.I(TAG, "Phonebook.getRecord() new accessor !");
+				Contact c = contactList.get(idd);
+				if (c != null) {
+					if (logging_enable) Logger.I(TAG, "Phonebook.getRecord() found in list");
+					return c;
+				}
+				c = ((ContactAccessorNew)accessor).getContactByID(Contact.convertRhodeIDtoPlatformID(idd));
+				if (c != null) {
+					if (logging_enable) Logger.I(TAG, "Phonebook.getRecord() found in system");
+					contactList.put(c.getField(Phonebook.PB_I_ID), c);
+				}
+				else {
+					if (logging_enable) Logger.I(TAG, "Phonebook.getRecord() not found in system");
+				}
+				return c;
+			}
+			else {
+				if (logging_enable) Logger.I(TAG, "Phonebook.getRecord() old accessor class");
+				if (!mIsFullListReceived) {
+					prepareFullList();
+				}	
+			}
+			Contact cc = contactList.get(idd);
+			if (cc != null) {
+				if (logging_enable) Logger.I(TAG, "Phonebook.getRecord() return record");
+			}
+			else {
+				if (logging_enable) Logger.I(TAG, "Phonebook.getRecord() return NULL");
+			}
+			return cc;
 		}
 		catch (Exception e) {
 			Logger.E(TAG, e);
@@ -184,7 +264,7 @@ public class Phonebook {
 				return;
 			
 			accessor.remove(contact);
-			contactList.remove(contact.getField(PB_ID));
+			contactList.remove(contact.getField(Phonebook.PB_I_ID));
 		}
 		catch (Exception e) {
 			Logger.E(TAG, e);
@@ -197,7 +277,7 @@ public class Phonebook {
 				return;
 			
 			accessor.save(contact);
-			contactList.put(contact.getField(PB_ID), contact);
+			contactList.put(contact.getField(Phonebook.PB_I_ID), contact);
 		}
 		catch (Exception e) {
 			Logger.E(TAG, e);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java

@@ -27,6 +27,16 @@ public class PerformOnUiThread implements Runnable {
 		}
 	}
 	
+	public static void exec(Runnable r, int delay) {
+		try {
+			RhodesService rhodes = RhodesService.getInstance();
+			rhodes.post(r, delay);
+		}
+		catch (Exception e) {
+			Logger.E(TAG, "exec failed: " + e.getMessage());
+		}
+	}
+	
 	public static void exec(Runnable r, boolean wait) {
 		try {
 			RhodesService rhodes = RhodesService.getInstance();

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java

@@ -1,7 +1,11 @@
 package com.rhomobile.rhodes.webview;
 
+import android.webkit.WebChromeClient;
+import android.webkit.WebStorage;
+
 import com.rhomobile.rhodes.Logger;
 
+
 public class ChromeClientNew extends ChromeClientOld {
 
 	private static final String TAG = "ChromeClientNew";
@@ -10,5 +14,12 @@ public class ChromeClientNew extends ChromeClientOld {
 	public void onConsoleMessage(String message, int lineNumber, String sourceID) {
 		Logger.D(TAG, message + " -- From line " + lineNumber + " of " + sourceID);
 	}
+
+    public void onExceededDatabaseQuota(String url, String databaseIdentifier, long currentQuota, long estimatedSize,
+            long totalUsedQuota, WebStorage.QuotaUpdater quotaUpdater) {
+            quotaUpdater.updateQuota(estimatedSize * 2);
+    }
 	
 }
+
+

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java

@@ -1,5 +1,8 @@
 package com.rhomobile.rhodes.webview;
 
+import com.rhomobile.rhodes.RhodesService;
+
+import android.content.Context;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 
@@ -11,6 +14,13 @@ public class RhoWebSettingsNew implements RhoWebSettings {
 		
 		webSettings.setAppCacheEnabled(true);
 		
+		
+		webSettings.setDatabaseEnabled(true);
+		webSettings.setJavaScriptEnabled(true); 
+		
+		String databasePath = RhodesService.getInstance().getContext().getDir("database", Context.MODE_PRIVATE).getPath();
+		webSettings.setDatabasePath(databasePath);
+		 
 		return webSettings;
 	}