aboutsummaryrefslogtreecommitdiff
path: root/src/com/android/providers/contacts/ContactsProvider.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/providers/contacts/ContactsProvider.java')
-rw-r--r--src/com/android/providers/contacts/ContactsProvider.java80
1 files changed, 67 insertions, 13 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider.java b/src/com/android/providers/contacts/ContactsProvider.java
index 7a324155..e25ef394 100644
--- a/src/com/android/providers/contacts/ContactsProvider.java
+++ b/src/com/android/providers/contacts/ContactsProvider.java
@@ -26,6 +26,7 @@ import android.content.ContentValues;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.UriMatcher;
+import android.content.res.Resources;
import android.database.Cursor;
import android.database.CursorJoiner;
import android.database.DatabaseUtils;
@@ -754,6 +755,8 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
Uri notificationUri = Contacts.CONTENT_URI;
+ StringBuilder whereClause;
+ String groupBy = null;
// Generate the body of the query
int match = sURIMatcher.match(url);
@@ -869,6 +872,28 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
break;
}
+ case PEOPLE_WITH_EMAIL_OR_IM_FILTER:
+ String email = url.getPathSegments().get(2);
+ whereClause = new StringBuilder();
+
+ // Match any E-mail or IM contact methods where data exactly
+ // matches the provided string.
+ whereClause.append(ContactMethods.DATA);
+ whereClause.append("=");
+ DatabaseUtils.appendEscapedSQLString(whereClause, email);
+ whereClause.append(" AND (kind = " + Contacts.KIND_EMAIL +
+ " OR kind = " + Contacts.KIND_IM + ")");
+ qb.appendWhere(whereClause.toString());
+
+ qb.setTables("people INNER JOIN contact_methods on (people._id = contact_methods.person)");
+ qb.setProjectionMap(sPeopleWithEmailOrImProjectionMap);
+
+ // Prevent returning the same person for multiple matches
+ groupBy = "contact_methods.person";
+
+ qb.setDistinct(true);
+ break;
+
case PHOTOS_ID:
qb.appendWhere("_id="+url.getPathSegments().get(1));
// Fall through.
@@ -920,7 +945,7 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
final SQLiteDatabase db = getDatabase();
Cursor c = db.rawQueryWithFactory(null, query, null, sPeopleTable);
if ((c != null) && !isTemporary()) {
- c.setNotificationUri(getContext().getContentResolver(), url);
+ c.setNotificationUri(getContext().getContentResolver(), notificationUri);
}
return c;
}
@@ -951,7 +976,7 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
final SQLiteDatabase db = getDatabase();
Cursor c = db.rawQueryWithFactory(null, query, null, sPeopleTable);
if ((c != null) && !isTemporary()) {
- c.setNotificationUri(getContext().getContentResolver(), url);
+ c.setNotificationUri(getContext().getContentResolver(), notificationUri);
}
return c;
}
@@ -1091,7 +1116,7 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
break;
case CONTACTMETHODS_EMAIL_FILTER:
String pattern = url.getPathSegments().get(2);
- StringBuilder whereClause = new StringBuilder();
+ whereClause = new StringBuilder();
// TODO This is going to be REALLY slow. Come up with
// something faster.
@@ -1232,7 +1257,7 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
// run the query
final SQLiteDatabase db = getDatabase();
Cursor c = qb.query(db, projectionIn, selection, selectionArgs,
- null, null, sort);
+ groupBy, null, sort);
if ((c != null) && !isTemporary()) {
c.setNotificationUri(getContext().getContentResolver(), notificationUri);
}
@@ -1297,18 +1322,33 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
SearchManager.SUGGEST_COLUMN_INTENT_ACTION,
};
-/*
- * TODO: figure out how to localize things so myFaves can read the constants when sub classing
- */
+ Resources r = getContext().getResources();
+ String s;
+ int i;
+
ArrayList dialNumber = new ArrayList();
- dialNumber.add("Dial number");
- dialNumber.add("Using " + searchClause);
+ s = r.getString(com.android.internal.R.string.dial_number_using, searchClause);
+ i = s.indexOf('\n');
+ if (i < 0) {
+ dialNumber.add(s);
+ dialNumber.add("");
+ } else {
+ dialNumber.add(s.substring(0, i));
+ dialNumber.add(s.substring(i + 1));
+ }
dialNumber.add("tel:" + searchClause);
- dialNumber.add(Intents.SEARCH_SUGGESTION_DIAL_NUMBER_CLICKED);
+ dialNumber.add(Intents.SEARCH_SUGGESTION_DIAL_NUMBER_CLICKED);
ArrayList createContact = new ArrayList();
- createContact.add("Create contact");
- createContact.add("Using " + searchClause);
+ s = r.getString(com.android.internal.R.string.create_contact_using, searchClause);
+ i = s.indexOf('\n');
+ if (i < 0) {
+ createContact.add(s);
+ createContact.add("");
+ } else {
+ createContact.add(s.substring(0, i));
+ createContact.add(s.substring(i + 1));
+ }
createContact.add("tel:" + searchClause);
createContact.add(Intents.SEARCH_SUGGESTION_CREATE_CONTACT_CLICKED);
@@ -3699,6 +3739,7 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
private static final int PEOPLE_OWNER = PEOPLE_BASE + 19;
private static final int PEOPLE_UPDATE_CONTACT_TIME = PEOPLE_BASE + 20;
private static final int PEOPLE_PHONES_WITH_PRESENCE = PEOPLE_BASE + 21;
+ private static final int PEOPLE_WITH_EMAIL_OR_IM_FILTER = PEOPLE_BASE + 22;
private static final int DELETED_BASE = 1000;
private static final int DELETED_PEOPLE = DELETED_BASE;
@@ -3769,6 +3810,7 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
private static final HashMap<String, String> sGroupsProjectionMap;
private static final HashMap<String, String> sPeopleProjectionMap;
private static final HashMap<String, String> sPeopleWithPhotoProjectionMap;
+ private static final HashMap<String, String> sPeopleWithEmailOrImProjectionMap;
/** Used to force items to the top of a times_contacted list */
private static final HashMap<String, String> sStrequentStarredProjectionMap;
private static final HashMap<String, String> sCallsProjectionMap;
@@ -3876,6 +3918,8 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
matcher.addURI(CONTACTS_AUTHORITY, "people/filter/*", PEOPLE_FILTER);
matcher.addURI(CONTACTS_AUTHORITY, "people/with_phones_filter/*",
PEOPLE_WITH_PHONES_FILTER);
+ matcher.addURI(CONTACTS_AUTHORITY, "people/with_email_or_im_filter/*",
+ PEOPLE_WITH_EMAIL_OR_IM_FILTER);
matcher.addURI(CONTACTS_AUTHORITY, "people/#", PEOPLE_ID);
matcher.addURI(CONTACTS_AUTHORITY, "people/#/extensions", PEOPLE_EXTENSIONS);
matcher.addURI(CONTACTS_AUTHORITY, "people/#/extensions/#", PEOPLE_EXTENSIONS_ID);
@@ -4003,6 +4047,14 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
map.put("photo_data", "photos.data AS photo_data");
sPeopleWithPhotoProjectionMap = map;
+ // People with E-mail or IM projection map
+ map = new HashMap<String, String>();
+ map.put(People._ID, "people._id AS " + People._ID);
+ map.put(ContactMethods.DATA, "contact_methods." + ContactMethods.DATA + " AS " + ContactMethods.DATA);
+ map.put(ContactMethods.KIND, "contact_methods." + ContactMethods.KIND + " AS " + ContactMethods.KIND);
+ map.putAll(peopleColumns);
+ sPeopleWithEmailOrImProjectionMap = map;
+
// Groups projection map
map = new HashMap<String, String>();
map.put(Groups._ID, Groups._ID);
@@ -4133,7 +4185,9 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
map = new HashMap<String, String>();
map.put(LiveFolders._ID, "people._id AS " + LiveFolders._ID);
map.put(LiveFolders.NAME, DISPLAY_NAME_SQL + " AS " + LiveFolders.NAME);
- map.put(LiveFolders.ICON_BITMAP, Photos.DATA + " AS " + LiveFolders.ICON_BITMAP);
+ // TODO: Put contact photo back when we have a way to display a default icon
+ // for contacts without a photo
+ // map.put(LiveFolders.ICON_BITMAP, Photos.DATA + " AS " + LiveFolders.ICON_BITMAP);
sLiveFoldersProjectionMap = map;
// Order by statements
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 20:28:01 +0000