ContactsCommon: Don't pass contact id in ContactBuilder

* Also use structured name as default type.
* Add helpers for setting contact image from lookup

Addresses MMS-149

Change-Id: I63df3623f7b19d4fca81d52790a62ee6bb24e785

3 files changed, 20 insertions, 6 deletions

diff --git a/src/com/android/contacts/common/model/Contact.java b/src/com/android/contacts/common/model/Contact.java
index 320d2653..11ad0e9c 100644
--- a/src/com/android/contacts/common/model/Contact.java
+++ b/src/com/android/contacts/common/model/Contact.java
@@ -222,7 +222,7 @@ public class Contact {
         mDirectoryExportSupport = exportSupport;
     }
 
-    /* package */ void setPhotoBinaryData(byte[] photoBinaryData) {
+    public void setPhotoBinaryData(byte[] photoBinaryData) {
         mPhotoBinaryData = photoBinaryData;
     }
 
diff --git a/src/com/android/contacts/common/model/ContactBuilder.java b/src/com/android/contacts/common/model/ContactBuilder.java
index 9840e711..b40ea26b 100644
--- a/src/com/android/contacts/common/model/ContactBuilder.java
+++ b/src/com/android/contacts/common/model/ContactBuilder.java
@@ -71,7 +71,7 @@ public class ContactBuilder {
 
     private String mNormalizedNumber;
     private String mFormattedNumber;
-    private int mDisplayNameSource = DisplayNameSources.ORGANIZATION;
+    private int mDisplayNameSource = DisplayNameSources.STRUCTURED_NAME;
     private Uri mPhotoUri;
     private String mPhotoUrl;
 
@@ -279,12 +279,10 @@ public class ContactBuilder {
 
         final ContentValues values = new ContentValues();
         values.put(ContactsContract.Data._ID, -1);
-        values.put(ContactsContract.Data.CONTACT_ID, -1);
         final RawContact rawContact = new RawContact(values);
 
         final ContentValues numberValues = new ContentValues();
         numberValues.put(ContactsContract.Data._ID, -1);
-        numberValues.put(ContactsContract.Data.CONTACT_ID, -1);
         numberValues.put(ContactsContract.Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE);
 
         // Use the incoming call's phone number if no other phone number
@@ -322,7 +320,6 @@ public class ContactBuilder {
 
             final ContentValues addressValues = new ContentValues();
             addressValues.put(ContactsContract.Data._ID, -1);
-            addressValues.put(ContactsContract.Data.CONTACT_ID, -1);
             addressValues.put(ContactsContract.Data.MIMETYPE, StructuredPostal.CONTENT_ITEM_TYPE);
 
             // Insert addresses if there are any
@@ -423,7 +420,6 @@ public class ContactBuilder {
 
             final ContentValues nameValues = new ContentValues();
             nameValues.put(ContactsContract.Data._ID, -1);
-            nameValues.put(ContactsContract.Data.CONTACT_ID, -1);
             nameValues.put(ContactsContract.Data.DATA1, mName.displayName);
             nameValues.put(ContactsContract.Data.MIMETYPE, StructuredName.CONTENT_ITEM_TYPE);
             rawContact.addDataItemValues(nameValues);
diff --git a/src/com/android/contacts/common/util/BitmapUtil.java b/src/com/android/contacts/common/util/BitmapUtil.java
index 66ab00f5..6b776d78 100644
--- a/src/com/android/contacts/common/util/BitmapUtil.java
+++ b/src/com/android/contacts/common/util/BitmapUtil.java
@@ -27,6 +27,9 @@ import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.BitmapDrawable;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
 /**
  * Provides static functions to decode bitmaps at the optimal size
  */
@@ -159,4 +162,19 @@ public class BitmapUtil {
         canvas.drawBitmap(input, src, dst, paint);
         return result;
     }
+
+    public static byte[] bitmapToByteArray(Bitmap bitmap) {
+        if (bitmap == null) {
+            return null;
+        }
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        bitmap.compress(Bitmap.CompressFormat.JPEG, 90, stream);
+        byte[] result = stream.toByteArray();
+        try {
+            stream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
 }