refactored the contacts photo retrieval to allow actual photo uris as well. The previous implementeation only worked with contact and lookup uris.

Author: Mahram Z. Foadi

picasso/src/main/java/com/squareup/picasso/ContactsPhotoBitmapHunter.java

@@ -33,9 +33,36 @@
 import static com.squareup.picasso.Picasso.LoadedFrom.DISK;
 
 class ContactsPhotoBitmapHunter extends BitmapHunter {
-  final Context context;
+  /**
+   a lookup uri (e.g. content://com.android.contacts/contacts/lookup/3570i61d948d30808e537 )
+  */
+  private static final int ID_LOOKUP = 1;
+  /**
+   a contact thumbnail uri (e.g. content://com.android.contacts/contacts/38/photo)
+   */
+  private static final int ID_THUMBNAIL = 2;
+  /**
+   a contact uri (e.g. content://com.android.contacts/contacts/38)
+   */
+  private static final int ID_CONTACT = 3;
+  /**
+   a contact display photo (high resolution) uri
+   (e.g. content://com.android.contacts/display_photo/5)
+   */
+  private static final int ID_DISPLAY_PHOTO = 4;
+
   static final UriMatcher matcher;
 
+  static {
+    matcher = new UriMatcher(UriMatcher.NO_MATCH);
+    matcher.addURI(ContactsContract.AUTHORITY, "contacts/lookup/*", ID_LOOKUP);
+    matcher.addURI(ContactsContract.AUTHORITY, "contacts/#/photo", ID_THUMBNAIL);
+    matcher.addURI(ContactsContract.AUTHORITY, "contacts/#", ID_CONTACT);
+    matcher.addURI(ContactsContract.AUTHORITY, "display_photo/#", ID_DISPLAY_PHOTO);
+  }
+
+  final Context context;
+
   ContactsPhotoBitmapHunter(Context context, Picasso picasso, Dispatcher dispatcher, Cache cache,
       Stats stats, Action action) {
     super(picasso, dispatcher, cache, stats, action);
@@ -61,22 +88,23 @@ private InputStream getInputStream() throws IOException {
     ContentResolver contentResolver = context.getContentResolver();
     Uri uri = getData().uri;
     switch (matcher.match(uri)) {
-        case ID_LOOKUP:
-          uri = ContactsContract.Contacts.lookupContact(contentResolver, uri);
-          if (null == uri) {
-            return null;
-          }
-        case ID_CONTACT:
-          if (SDK_INT < ICE_CREAM_SANDWICH) {
-            return openContactPhotoInputStream(contentResolver, uri);
-          } else {
-            return ContactPhotoStreamIcs.get(contentResolver, uri);
-          }
-        case ID_THUMBNAIL:
-        case ID_DISPLAY_PHOTO:
-          return contentResolver.openInputStream(uri);
-        default:
+      case ID_LOOKUP:
+        uri = ContactsContract.Contacts.lookupContact(contentResolver, uri);
+        if (null == uri) {
           return null;
+        }
+        // Resolved the uri to a contact uri, intentionally fall through to process the resolved uri
+      case ID_CONTACT:
+        if (SDK_INT < ICE_CREAM_SANDWICH) {
+          return openContactPhotoInputStream(contentResolver, uri);
+        } else {
+          return ContactPhotoStreamIcs.get(contentResolver, uri);
+        }
+      case ID_THUMBNAIL:
+      case ID_DISPLAY_PHOTO:
+        return contentResolver.openInputStream(uri);
+      default:
+        throw new IllegalStateException ("Invalid uri: " + uri);
     }
   }
 
@@ -105,30 +133,4 @@ static InputStream get(ContentResolver contentResolver, Uri uri) {
       return openContactPhotoInputStream(contentResolver, uri, true);
     }
   }
-
-  /**
-   a lookup uri (e.g. content://com.android.contacts/contacts/lookup/3570i61d948d30808e537 )
-   */
-  private static final int ID_LOOKUP = 1;
-  /**
-   a contact thumbnail uri (e.g. content://com.android.contacts/contacts/38/photo)
-   */
-  private static final int ID_THUMBNAIL = 2;
-  /**
-   a contact uri (e.g. content://com.android.contacts/contacts/38)
-   */
-  private static final int ID_CONTACT = 3;
-  /**
-   a contact display photo (high resolution) uri
-   (e.g. content://com.android.contacts/display_photo/5)
-   */
-  private static final int ID_DISPLAY_PHOTO = 4;
-
-  static {
-      matcher = new UriMatcher(UriMatcher.NO_MATCH);
-      matcher.addURI(ContactsContract.AUTHORITY, "contacts/lookup/*", ID_LOOKUP);
-      matcher.addURI(ContactsContract.AUTHORITY, "contacts/#/photo", ID_THUMBNAIL);
-      matcher.addURI(ContactsContract.AUTHORITY, "contacts/#", ID_CONTACT);
-      matcher.addURI(ContactsContract.AUTHORITY, "display_photo/#", ID_DISPLAY_PHOTO);
-  }
 }