commit f6d358f37a222376bcc5fd159fcf98c22dc22931
author Daniel Lehmann <lehmannd@google.com> Sat Sep 25 18:08:18 2010 -0700
committer Daniel Lehmann <lehmannd@google.com> Sat Sep 25 18:08:18 2010 -0700
tree f32306b457403418680c03283e1c86c4ff0817b2
parent d4d01a11f310c1a45f5fcddb173dcc0318a84b4e

Fix loading of empty photo

Change-Id: I88b699aa0d8089b631e47cbd3ce0ad7299283b9b

src/com/android/contacts/list/ContactListAdapter.java

diff --git a/src/com/android/contacts/list/ContactListAdapter.java b/src/com/android/contacts/list/ContactListAdapter.java
index bb72e69..7e2c4c2 100644
--- a/src/com/android/contacts/list/ContactListAdapter.java
+++ b/src/com/android/contacts/list/ContactListAdapter.java
@@ -250,10 +250,9 @@
         if (photoId != 0) {
             getPhotoLoader().loadPhoto(view.getPhotoView(), photoId);
         } else {
-            String photoUri = cursor.getString(CONTACT_PHOTO_URI_COLUMN_INDEX);
-            if (photoUri != null) {
-                getPhotoLoader().loadPhoto(view.getPhotoView(), Uri.parse(photoUri));
-            }
+            final String photoUriString = cursor.getString(CONTACT_PHOTO_URI_COLUMN_INDEX);
+            final Uri photoUri = photoUriString == null ? null : Uri.parse(photoUriString);
+            getPhotoLoader().loadPhoto(view.getPhotoView(), photoUri);
         }
     }