Merge pull request #443 from top-gun007/contact_ambiguity

FIX: Ambiguous contact photo bug resolved.

Author: sandarumk

app/src/main/java/com/peacecorps/pcsa/circle_of_trust/ContactPhotoLoader.java

@@ -60,21 +60,22 @@ protected void onPostExecute(Bitmap bitmap) {
     private Integer fetchThumbnailId(String phoneNumber) {
         ContentResolver contentResolver = context.getContentResolver();
 
-        final Uri uri = Uri.withAppendedPath(ContactsContract.CommonDataKinds.Phone.CONTENT_FILTER_URI, Uri.encode(phoneNumber));
-        final Cursor cursor = contentResolver.query(uri, PHOTO_ID_PROJECTION, null, null, ContactsContract.Contacts.DISPLAY_NAME + " ASC");
+        final Uri uri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(phoneNumber));
+
+        final Cursor cursor = contentResolver.query(uri, PHOTO_ID_PROJECTION, null, null, null);
 
         try {
             Integer thumbnailId = null;
-            if (cursor!= null && cursor.moveToFirst()) {
+            if (cursor != null && cursor.moveToFirst()) {
                 thumbnailId = cursor.getInt(cursor.getColumnIndex(ContactsContract.Contacts.PHOTO_ID));
             }
             return thumbnailId;
         } catch (Exception e) {
             Log.e(TAG, "Unable to load thumbnail ID", e);
             return null;
         } finally {
-            if(cursor !=null)
-            cursor.close();
+            if (cursor != null)
+                cursor.close();
         }
 
     }
@@ -103,8 +104,8 @@ private Bitmap fetchThumbnail(final int thumbnailId) {
             Log.e(TAG, "Unable to load thumbnail image", e);
             return null;
         } finally {
-            if(cursor != null)
-            cursor.close();
+            if (cursor != null)
+                cursor.close();
         }
 
     }