commit 98b3b9ad3f727147d3ea1ee57008715a83488b79
author Alon Albert <aalbert@google.com> Mon Sep 09 14:05:53 2013 -0700
committer Alon Albert <aalbert@google.com> Tue Sep 10 08:21:54 2013 -0700
tree 9a5e0dc3c016e68d4b9a8acf485b0f2c5d766e63
parent db2adcb4d4da6361301701da08c4f3c72b577fd3

Support Photo URL in Encoded Contacts

Encoded contacts may have a photo url as an HTTP link rather than a content://
, file:// or android.resource:// URL. This adds support for such photos URLs

Bug: 10671856
Change-Id: If861bca096454dac043c63eea26731bf487fd824

src/com/android/contacts/model/ContactLoader.java

diff --git a/src/com/android/contacts/model/ContactLoader.java b/src/com/android/contacts/model/ContactLoader.java
index 7820310..4c0e70a 100644
--- a/src/com/android/contacts/model/ContactLoader.java
+++ b/src/com/android/contacts/model/ContactLoader.java
@@ -59,8 +59,9 @@
 import org.json.JSONObject;
 
 import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -361,6 +362,7 @@
         final String altDisplayName = json.optString(
                 Contacts.DISPLAY_NAME_ALTERNATIVE, displayName);
         final int displayNameSource = json.getInt(Contacts.DISPLAY_NAME_SOURCE);
+        final String photoUri = json.optString(Contacts.PHOTO_URI, null);
         final Contact contact = new Contact(
                 uri, uri,
                 mLookupUri,
@@ -370,7 +372,7 @@
                 -1 /* nameRawContactId */,
                 displayNameSource,
                 -1 /* photoId */,
-                null /* photoUri */,
+                photoUri,
                 displayName,
                 altDisplayName,
                 null /* phoneticName */,
@@ -489,25 +491,35 @@
      * not found, returns null
      */
     private void loadPhotoBinaryData(Contact contactData) {
-
         // If we have a photo URI, try loading that first.
         String photoUri = contactData.getPhotoUri();
         if (photoUri != null) {
             try {
-                AssetFileDescriptor fd = getContext().getContentResolver()
-                       .openAssetFileDescriptor(Uri.parse(photoUri), "r");
+                final InputStream inputStream;
+                final AssetFileDescriptor fd;
+                final Uri uri = Uri.parse(photoUri);
+                final String scheme = uri.getScheme();
+                if ("http".equals(scheme) || "https".equals(scheme)) {
+                    // Support HTTP urls that might come from extended directories
+                    inputStream = new URL(photoUri).openStream();
+                    fd = null;
+                } else {
+                    fd = getContext().getContentResolver().openAssetFileDescriptor(uri, "r");
+                    inputStream = fd.createInputStream();
+                }
                 byte[] buffer = new byte[16 * 1024];
-                FileInputStream fis = fd.createInputStream();
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 try {
                     int size;
-                    while ((size = fis.read(buffer)) != -1) {
+                    while ((size = inputStream.read(buffer)) != -1) {
                         baos.write(buffer, 0, size);
                     }
                     contactData.setPhotoBinaryData(baos.toByteArray());
                 } finally {
-                    fis.close();
-                    fd.close();
+                    inputStream.close();
+                    if (fd != null) {
+                        fd.close();
+                    }
                 }
                 return;
             } catch (IOException ioe) {