commit 5ab8d7fc444922f1069024f2c631929467d5a47c
author Dmitri Plotnikov <dplotnikov@google.com> Wed Feb 16 10:51:33 2011 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Wed Feb 16 10:51:33 2011 -0800
tree 76e866cbfa64290df5ff111c2959bbdb68db4561
parent 5f93b52d7f1bc940ab147bae4bd192ec4c68ae27

Switching to a lookup key-based query in QuickContact

Bug: 3460622
Change-Id: I18f6a56858e4e42604aa6cfae168a90cf8a92d80

src/com/android/contacts/quickcontact/QuickContactWindow.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactWindow.java b/src/com/android/contacts/quickcontact/QuickContactWindow.java
index edf9d3d..3a1bc9d 100644
--- a/src/com/android/contacts/quickcontact/QuickContactWindow.java
+++ b/src/com/android/contacts/quickcontact/QuickContactWindow.java
@@ -379,20 +379,7 @@
      * {@link Contacts#CONTENT_LOOKUP_URI} style {@link Uri}.
      */
     private Uri getDataUri(Uri lookupUri) {
-        // TODO: Formalize method of extracting LOOKUP_KEY
-        final List<String> path = lookupUri.getPathSegments();
-        final boolean validLookup = path.size() >= 3 && "lookup".equals(path.get(1));
-        if (!validLookup) {
-            // We only accept valid lookup-style Uris
-            throw new IllegalArgumentException("Expecting lookup-style Uri");
-        } else if (path.size() == 3) {
-            // No direct _ID provided, so force a lookup
-            lookupUri = Contacts.lookupContact(mContext.getContentResolver(), lookupUri);
-        }
-
-        final long contactId = ContentUris.parseId(lookupUri);
-        return Uri.withAppendedPath(ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId),
-                Contacts.Data.CONTENT_DIRECTORY);
+        return Uri.withAppendedPath(lookupUri, Contacts.Data.CONTENT_DIRECTORY);
     }
 
     /**