rhodes 3.2.3 → 3.3.0.beta.1

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality07.java

@@ -0,0 +1,34 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+package com.rhomobile.rhodes.osfunctionality;
+
+
+//Android 2.1
+class AndroidFunctionality07 extends AndroidFunctionality06 implements AndroidFunctionality {
+
+	
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality08.java

@@ -0,0 +1,44 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+package com.rhomobile.rhodes.osfunctionality;
+
+import com.rhomobile.rhodes.RhodesService;
+
+import android.content.Context;
+import android.view.Display;
+import android.view.WindowManager;
+
+
+//Android 2.2
+class AndroidFunctionality08 extends AndroidFunctionality07 implements AndroidFunctionality {
+
+	public int getDeviceRotation() {
+		Display display = ((WindowManager) RhodesService.getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+		int rotation = display.getRotation();
+		return rotation;
+	}
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality09.java

@@ -0,0 +1,34 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+package com.rhomobile.rhodes.osfunctionality;
+
+
+//Android 2.3.1
+class AndroidFunctionality09 extends AndroidFunctionality08 implements AndroidFunctionality {
+
+	
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality10.java

@@ -0,0 +1,34 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+package com.rhomobile.rhodes.osfunctionality;
+
+
+//Android 2.3.3
+class AndroidFunctionality10 extends AndroidFunctionality09 implements AndroidFunctionality {
+
+	
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionalityManager.java

@@ -0,0 +1,73 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+package com.rhomobile.rhodes.osfunctionality;
+
+import android.os.Build;
+
+
+public class AndroidFunctionalityManager {
+
+private static AndroidFunctionality ourFunctionality = null;
+	
+	public static AndroidFunctionality getAndroidFunctionality() {
+		if (ourFunctionality == null) {
+			int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
+			if (sdkVersion >= 10) {
+				ourFunctionality = new AndroidFunctionality10();
+			}
+			else if (sdkVersion >= 9) {
+				ourFunctionality = new AndroidFunctionality09();
+			}
+			else if (sdkVersion >= 8) {
+				ourFunctionality = new AndroidFunctionality08();
+			}
+			else if (sdkVersion >= 7) {
+				ourFunctionality = new AndroidFunctionality07();
+			}
+			else if (sdkVersion >= 6) {
+				ourFunctionality = new AndroidFunctionality06();
+			}
+			else if (sdkVersion >= 5) {
+				ourFunctionality = new AndroidFunctionality05();
+			}
+			else if (sdkVersion >= 4) {
+				ourFunctionality = new AndroidFunctionality04();
+			}
+			else if (sdkVersion >= 3) {
+				ourFunctionality = new AndroidFunctionality03();
+			}
+			else if (sdkVersion >= 2) {
+				ourFunctionality = new AndroidFunctionality02();
+			}
+			else {
+				ourFunctionality = new AndroidFunctionality01();
+			}
+		}
+		return ourFunctionality;
+	}
+	
+}

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

@@ -29,6 +29,7 @@ package com.rhomobile.rhodes.phonebook;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 import com.rhomobile.rhodes.Logger;
 
@@ -43,12 +44,62 @@ public class Contact {
 	
 	public Contact() { }
 
-	public Contact(ContactAccessor accessor, String id, String displayName) {
-		this.id = id;
-		mFields.put(Phonebook.PB_ID, id);
-		mFields.put(Phonebook.PB_DISPLAY_NAME, displayName);
-	}
-	
+    public Contact(ContactAccessor accessor, String id, String displayName) {
+        this.id = id;
+        mFields.put(Phonebook.PB_ID, id);
+        mFields.put(Phonebook.PB_DISPLAY_NAME, displayName);
+    }
+
+    void reset(String id, String displayName) {
+        mFields.clear();
+        this.id = id;
+        mFields.put(Phonebook.PB_ID, id);
+        mFields.put(Phonebook.PB_DISPLAY_NAME, displayName);
+    }
+
+    boolean checkConditions(Map<String, Object> conditions)
+    {
+        if (conditions == null)
+            return true;
+        
+        Set<String> cond_keys = conditions.keySet();
+        for (String key: cond_keys) {
+            Object condObj = conditions.get(key);
+            String cond = null;
+            boolean isNullFields = true;
+
+            if (condObj instanceof String) {
+                cond = (String)condObj;
+            }
+            //TODO: if (condObj instanceof Map<String, String>)
+
+            Logger.I(TAG, "Check " + key + " " + cond + ", contact: " + id());
+            
+            
+            if (key.equalsIgnoreCase("phone")) {
+                isNullFields = getField(Phonebook.PB_BUSINESS_NUMBER) == null
+                            && getField(Phonebook.PB_HOME_NUMBER) == null
+                            && getField(Phonebook.PB_MOBILE_NUMBER) == null;
+            }
+            else if (key.equalsIgnoreCase("email")) {
+                isNullFields = getField(Phonebook.PB_EMAIL_ADDRESS) == null;
+            }
+
+            if (cond.equalsIgnoreCase("not_nil")) {
+                if (isNullFields)
+                    return false;
+            }
+            else if (cond.equalsIgnoreCase("is_nil")) {
+                if (!isNullFields)
+                    return false;
+            }
+            
+        }
+        
+        Logger.I(TAG, "Condition is passed");
+        return true;
+    }
+
 	public void setField(String key, String value)
 	{
 		mFields.put(key,value);

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

@@ -31,8 +31,8 @@ import java.util.Map;
 
 public interface ContactAccessor {
 	
-	public int getCount(int offset, int limit) throws Exception;;
-	public Map<String, Contact> getContacts(int offset, int max_results, List<String> select) throws Exception;
+	public int getCount(int offset, int limit, Map<String, Object> conditions) throws Exception;;
+	public Map<String, Contact> getContacts(int offset, int max_results, List<String> select, Map<String, Object> conditions) throws Exception;
 	public Contact getContact(String id) throws Exception;
 	public void save(Contact contact) throws Exception;
 	public void remove(Contact contact);

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

@@ -27,8 +27,10 @@
 package com.rhomobile.rhodes.phonebook;
 
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesService;
@@ -196,85 +198,329 @@ public class ContactAccessorNew implements ContactAccessor {
 			cursor.close();
 		}
 	}
-	
-	@Override
-	public int getCount(int offset, int max_results) {
-		StringBuilder sortMode = new StringBuilder();
-		if (max_results > 0 || offset > 0) {
-			sortMode.append(Contacts._ID).append(" ASC");
-			if (max_results > 0)
-				sortMode.append(" LIMIT ").append(max_results);
-			if (offset > 0)
-				sortMode.append(" OFFSET ").append(offset);
-		}
 
-		Cursor cursor = cr.query(Contacts.CONTENT_URI,
-				new String[] {Contacts._ID},
-				null, null, sortMode.toString());
-		int count = -1;
-		try {
-			count = cursor.getCount();
-		} finally {
-			cursor.close();
-		}
-		return count;
-	}
+    @Override
+    public int getCount(int offset, int max_results, Map<String, Object> conditions) {
+        int count = 0;
+        List<String> select = null;
+        
+        if (conditions != null && conditions.isEmpty())
+            conditions = null;
+        else
+            select = new LinkedList<String>();
 
-	@Override
-	public Map<String, Contact> getContacts(int offset, int max_results, List<String> select) throws Exception {
-		Map<String, Contact> contacts = new HashMap<String, Contact>();
-		
-		StringBuilder sortMode = new StringBuilder();
-		sortMode.append(Contacts.DISPLAY_NAME);//.append(" ASC");
-		if (max_results > 0)
-			sortMode.append(" LIMIT ").append(max_results);
-		if (offset > 0)
-			sortMode.append(" OFFSET ").append(offset);
-		
-		Cursor cursor = cr.query(Contacts.CONTENT_URI,
-				new String[] {Contacts._ID, Contacts.LOOKUP_KEY, Contacts.DISPLAY_NAME},
-				null, null, sortMode.toString());
-		try {
-			if (!cursor.moveToFirst())
-				return contacts;
-			
-			do {
-				
-				String key = cursor.getString(cursor.getColumnIndex(Contacts.LOOKUP_KEY));
-				String id = cursor.getString(cursor.getColumnIndex(Contacts._ID));
-				String displayName = cursor.getString(cursor.getColumnIndex(Contacts.DISPLAY_NAME));
-				Contact contact = new Contact(this, key, displayName);
-				
-				if (select != null) {
-					if (select.contains(Phonebook.PB_FIRST_NAME) ||
-					    select.contains(Phonebook.PB_LAST_NAME)) {
-						fillName(id, contact);
-					}
-					if (select.contains(Phonebook.PB_MOBILE_NUMBER) ||
-					    select.contains(Phonebook.PB_HOME_NUMBER) ||
-					    select.contains(Phonebook.PB_BUSINESS_NUMBER)) {
-						fillPhones(id, contact);
-					}
-					if (select.contains(Phonebook.PB_EMAIL_ADDRESS)) {
-						fillEmails(id, contact);
-					}
-					if (select.contains(Phonebook.PB_COMPANY_NAME)) {
-						fillCompany(id, contact);
-					}
-				}
-				
-				if (DEBUG) Logger.D(TAG, "Filling contact with ID: " + key);
-				contacts.put(contact.id(), contact);
-				
-			} while (cursor.moveToNext());
-		}
-		finally {
-			cursor.close();
-		}
-		
-		return contacts;
+        boolean manualOffset = false;
+
+        StringBuilder contactSortMode = new StringBuilder(Contacts.DISPLAY_NAME).append(',').append(Contacts._ID).append(" ASC");
+        if (conditions == null) {
+            if (max_results > 0)
+                contactSortMode.append(" LIMIT ").append(max_results);
+            if (offset > 0)
+                contactSortMode.append(" OFFSET ").append(offset);
+        } else {
+            manualOffset = offset > 0;
+        }
+
+        StringBuilder selection = new StringBuilder();
+        List<String> selectionArgs = new LinkedList<String>();
+        String[] selectionArray = null;
+        Cursor dataCursor = null;
+
+        if (conditions != null) {
+            Set<String> cond_keys = conditions.keySet();
+            for (String key: cond_keys) {
+                if (key.equalsIgnoreCase("phone")) {
+                    if (!select.contains(Phonebook.PB_BUSINESS_NUMBER))
+                        select.add(Phonebook.PB_BUSINESS_NUMBER);
+                    if (!select.contains(Phonebook.PB_HOME_NUMBER))
+                        select.add(Phonebook.PB_HOME_NUMBER);
+                    if (!select.contains(Phonebook.PB_MOBILE_NUMBER))
+                        select.add(Phonebook.PB_MOBILE_NUMBER);
+                }
+                else if (key.equalsIgnoreCase("email")) {
+                    if (!select.contains(Phonebook.PB_EMAIL_ADDRESS))
+                        select.add(Phonebook.PB_EMAIL_ADDRESS);
+                }
+            }
+            for(String field : select) {
+                if (selection.length() != 0) {
+                    selection.append(" OR ");
+                }
+
+                if (field.equals(Phonebook.PB_MOBILE_NUMBER) ||
+                         field.equals(Phonebook.PB_HOME_NUMBER) ||
+                         field.equals(Phonebook.PB_BUSINESS_NUMBER)) {
+                    selection.append(Data.MIMETYPE).append("=?");
+                    selectionArgs.add(Phone.CONTENT_ITEM_TYPE);
+                }
+                else if (field.equals(Phonebook.PB_EMAIL_ADDRESS)) {
+                    selection.append(Data.MIMETYPE).append("=?");
+                    selectionArgs.add(Email.CONTENT_ITEM_TYPE);
+                }
+            }
+
+            selectionArray = new String[selectionArgs.size()];
+            selectionArgs.toArray(selectionArray);
+
+            dataCursor = cr.query(Data.CONTENT_URI,
+                     new String[] {Data.CONTACT_ID, Data.LOOKUP_KEY, Data.DISPLAY_NAME, Data.MIMETYPE, Data.DATA1, Data.DATA2, Data.DATA3},
+                     selection.toString(),
+                     selectionArray,
+                     new StringBuilder(Data.DISPLAY_NAME).append(',').append(Data.CONTACT_ID).append(" ASC").toString());
+
+        }
+
+        Cursor contactCursor = cr.query(Contacts.CONTENT_URI,
+                new String[] {Contacts._ID, Contacts.LOOKUP_KEY, Contacts.DISPLAY_NAME},
+                null, null, contactSortMode.toString());
+
+        try {
+            long pos = 0;
+            Contact contact = null;
+
+            Logger.I(TAG, "Contact records: " + contactCursor.getCount());
+
+            if (dataCursor == null)
+                return contactCursor.getCount();
+            
+            Logger.I(TAG, "Contacts' data records: " + dataCursor.getCount());
+
+            boolean hasData = dataCursor != null && dataCursor.moveToFirst();
+            
+            if (contactCursor.moveToFirst()) do {
+                long curId = contactCursor.getLong(contactCursor.getColumnIndex(Contacts._ID));
+                Logger.I(TAG, "Processing contact id: " + curId + ", position: " + pos);
+
+                String key = contactCursor.getString(contactCursor.getColumnIndex(Contacts.LOOKUP_KEY));
+                String displayName = contactCursor.getString(contactCursor.getColumnIndex(Contacts.DISPLAY_NAME));
+
+                if (contact == null)
+                    contact = new Contact(this, key, displayName);
+                else
+                    contact.reset(key, displayName);
+
+                if (hasData)
+                    hasData = fillData(contact, curId, dataCursor, select);
+
+                if (contact.checkConditions(conditions)) {
+                    if (!manualOffset || pos >= offset) {
+                        count++;
+                        if (max_results > 0 && count >= max_results)
+                            break;
+                    }
+                    pos++;
+                }
+            } while (contactCursor.moveToNext());
+
+        }
+        finally {
+            contactCursor.close();
+            if (dataCursor != null)
+                dataCursor.close();
+        }
+        
+        return count;
 	}
-	
+
+
+    private boolean fillData(Contact contact, long contactId, Cursor dataCursor, List<String> select)
+    {
+        do {
+            long curId = dataCursor.getLong(dataCursor.getColumnIndex(Data.CONTACT_ID));
+            if (curId != contactId) return true;
+            
+            String mime = dataCursor.getString(dataCursor.getColumnIndex(Data.MIMETYPE));
+            if ((select == null || select.contains(Phonebook.PB_FIRST_NAME) || select.contains(Phonebook.PB_LAST_NAME))
+                && mime.equals(StructuredName.CONTENT_ITEM_TYPE)) {
+
+                String firstName = dataCursor.getString(dataCursor.getColumnIndex(StructuredName.GIVEN_NAME));
+                String lastName = dataCursor.getString(dataCursor.getColumnIndex(StructuredName.FAMILY_NAME));
+
+                if (firstName != null)
+                        contact.setField(Phonebook.PB_FIRST_NAME, firstName);
+                if (lastName != null)
+                        contact.setField(Phonebook.PB_LAST_NAME, lastName);
+            }
+
+            if (mime.equals(Phone.CONTENT_ITEM_TYPE)) {
+                int type = dataCursor.getInt(dataCursor.getColumnIndex(Phone.TYPE));
+                switch (type) {
+                case Phone.TYPE_HOME:
+                    if (select == null || select.contains(Phonebook.PB_HOME_NUMBER))
+                        contact.setField(Phonebook.PB_HOME_NUMBER, dataCursor.getString(dataCursor.getColumnIndex(Phone.NUMBER)));
+                    break;
+                case Phone.TYPE_WORK:
+                    if (select == null || select.contains(Phonebook.PB_BUSINESS_NUMBER))
+                        contact.setField(Phonebook.PB_BUSINESS_NUMBER, dataCursor.getString(dataCursor.getColumnIndex(Phone.NUMBER)));
+                    break;
+                case Phone.TYPE_MOBILE:
+                    if (select == null || select.contains(Phonebook.PB_MOBILE_NUMBER))
+                        contact.setField(Phonebook.PB_MOBILE_NUMBER, dataCursor.getString(dataCursor.getColumnIndex(Phone.NUMBER)));
+                    break;
+                }
+            }
+
+            if (mime.equals(Email.CONTENT_ITEM_TYPE) && (select == null || select.contains(Phonebook.PB_EMAIL_ADDRESS))) {
+                if (contact.getField(Phonebook.PB_EMAIL_ADDRESS) == null) {
+                    contact.setField(Phonebook.PB_EMAIL_ADDRESS, dataCursor.getString(dataCursor.getColumnIndex(Email.DATA)));
+                }
+            }
+
+            if (mime.equals(Organization.COMPANY) && (select == null || select.contains(Phonebook.PB_COMPANY_NAME))) {
+                String company = dataCursor.getString(dataCursor.getColumnIndex(Organization.COMPANY));
+                if (company != null)
+                    contact.setField(Phonebook.PB_COMPANY_NAME, company);
+            }
+        } while(dataCursor.moveToNext());
+
+        return false;
+    }
+
+
+    @Override
+    public Map<String, Contact> getContacts(int offset, int max_results, List<String> initialSelect, Map<String, Object> conditions) throws Exception {
+        
+        List<String> select;
+        if (initialSelect == null || initialSelect.isEmpty())
+            select = null;
+        else
+            select = new LinkedList<String>(initialSelect);
+
+        if (conditions != null && conditions.isEmpty())
+            conditions = null;
+        else if (select == null)
+            select = new LinkedList<String>();
+
+        boolean manualOffset = false;
+        StringBuilder contactSortMode = new StringBuilder(Contacts.DISPLAY_NAME).append(',').append(Contacts._ID).append(" ASC");
+        Map<String, Contact> contacts = new HashMap<String, Contact>();
+
+        if (conditions == null) {
+            if (max_results > 0)
+                contactSortMode.append(" LIMIT ").append(max_results);
+            if (offset > 0)
+                contactSortMode.append(" OFFSET ").append(offset);
+        } else {
+            manualOffset = offset > 0;
+        }
+
+        StringBuilder selection = new StringBuilder();
+        List<String> selectionArgs = new LinkedList<String>();
+
+        if (select == null) {
+            selection.append(Data.MIMETYPE).append("=? OR ")
+                     .append(Data.MIMETYPE).append("=? OR ")
+                     .append(Data.MIMETYPE).append("=? OR ")
+                     .append(Data.MIMETYPE).append("=?");
+
+            selectionArgs.add(StructuredName.CONTENT_ITEM_TYPE);
+            selectionArgs.add(Phone.CONTENT_ITEM_TYPE);
+            selectionArgs.add(Email.CONTENT_ITEM_TYPE);
+            selectionArgs.add(Organization.CONTENT_ITEM_TYPE);
+        } else {
+            if (conditions != null) {
+                Set<String> cond_keys = conditions.keySet();
+                for (String key: cond_keys) {
+                    if (key.equalsIgnoreCase("phone")) {
+                        if (!select.contains(Phonebook.PB_BUSINESS_NUMBER))
+                            select.add(Phonebook.PB_BUSINESS_NUMBER);
+                        if (!select.contains(Phonebook.PB_HOME_NUMBER))
+                            select.add(Phonebook.PB_HOME_NUMBER);
+                        if (!select.contains(Phonebook.PB_MOBILE_NUMBER))
+                            select.add(Phonebook.PB_MOBILE_NUMBER);
+                    }
+                    else if (key.equalsIgnoreCase("email")) {
+                        if (!select.contains(Phonebook.PB_EMAIL_ADDRESS))
+                            select.add(Phonebook.PB_EMAIL_ADDRESS);
+                    }
+                }
+            }
+            for(String field : select) {
+                if (selection.length() != 0) {
+                    selection.append(" OR ");
+                }
+
+                if (field.equals(Phonebook.PB_FIRST_NAME) || field.equals(Phonebook.PB_LAST_NAME)) {
+                    selection.append(Data.MIMETYPE).append("=?");
+                    selectionArgs.add(StructuredName.CONTENT_ITEM_TYPE);
+                }
+                else if (field.equals(Phonebook.PB_MOBILE_NUMBER) ||
+                         field.equals(Phonebook.PB_HOME_NUMBER) ||
+                         field.equals(Phonebook.PB_BUSINESS_NUMBER)) {
+                    selection.append(Data.MIMETYPE).append("=?");
+                    selectionArgs.add(Phone.CONTENT_ITEM_TYPE);
+                }
+                else if (field.equals(Phonebook.PB_EMAIL_ADDRESS)) {
+                    selection.append(Data.MIMETYPE).append("=?");
+                    selectionArgs.add(Email.CONTENT_ITEM_TYPE);
+                }
+                else if (field.equals(Phonebook.PB_COMPANY_NAME)) {
+                    selection.append(Data.MIMETYPE).append("=?");
+                    selectionArgs.add(Organization.CONTENT_ITEM_TYPE);
+                }
+            }
+        }
+
+        Cursor contactCursor = cr.query(Contacts.CONTENT_URI,
+                new String[] {Contacts._ID, Contacts.LOOKUP_KEY, Contacts.DISPLAY_NAME},
+                null, null, contactSortMode.toString());
+
+        Cursor dataCursor = null;
+
+        if (selection.length() != 0) {
+            String[] selectionArray = new String[selectionArgs.size()];
+            selectionArgs.toArray(selectionArray);
+
+            dataCursor = cr.query(Data.CONTENT_URI,
+                    new String[] {Data.CONTACT_ID, Data.LOOKUP_KEY, Data.DISPLAY_NAME, Data.MIMETYPE, Data.DATA1, Data.DATA2, Data.DATA3},
+                    selection.toString(),
+                    selectionArray,
+                    new StringBuilder(Data.DISPLAY_NAME).append(',').append(Data.CONTACT_ID).append(" ASC").toString());
+        }
+
+        try {
+            long pos = 0;
+            Contact contact = null;
+
+            Logger.I(TAG, "Contact records: " + contactCursor.getCount());
+            Logger.I(TAG, "Contacts' data records: " + ((dataCursor != null) ? dataCursor.getCount() : 0));
+
+            boolean hasData = dataCursor != null && dataCursor.moveToFirst();
+            if (contactCursor.moveToFirst()) do {
+                long curId = contactCursor.getLong(contactCursor.getColumnIndex(Contacts._ID));
+                Logger.I(TAG, "Processing contact id: " + curId + ", position: " + pos);
+
+                String key = contactCursor.getString(contactCursor.getColumnIndex(Contacts.LOOKUP_KEY));
+                String displayName = contactCursor.getString(contactCursor.getColumnIndex(Contacts.DISPLAY_NAME));
+
+                if (contact == null)
+                    contact = new Contact(this, key, displayName);
+                else
+                    contact.reset(key, displayName);
+
+                if (hasData)
+                    hasData = fillData(contact, curId, dataCursor, select);
+
+                if (contact.checkConditions(conditions)) {
+                    if (!manualOffset || pos >= offset) {
+                        contacts.put(contact.id(), contact);
+                        if (max_results > 0 && contacts.size() >= max_results)
+                            break;
+                        contact = null;
+                    }
+                    pos++;
+                }
+            } while (contactCursor.moveToNext());
+
+        }
+        finally {
+            contactCursor.close();
+            if (dataCursor != null)
+                dataCursor.close();
+        }
+        return contacts;
+    }
+
 	public Contact getContact(String lookupKey) throws Exception {
 		if (DEBUG)
 			Logger.D(TAG, "getContact(lookupKey="+lookupKey+")");