commit 77af73fbeacf73e79faaad2cda941d2acd9151cb
author Andy Huang <ath@google.com> Thu Mar 08 10:30:25 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 08 10:30:25 2012 -0800
tree 647cf39ce090e3378574a21cb15fe4496865233d
parent 4ce5994f43778d7a3e9876e961930d832228e7ff
parent 109369d52c80d25d1b02e769e2406656b0a8d4e4

Merge "update attachment projection column offsets"

src/com/android/mail/providers/UIProvider.java

diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index 0c74022..4458fef 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -831,7 +831,6 @@
             "vnd.android.cursor.item/vnd.com.android.mail.attachment";
 
     public static final String[] ATTACHMENT_PROJECTION = {
-        BaseColumns._ID,
         AttachmentColumns.NAME,
         AttachmentColumns.SIZE,
         AttachmentColumns.URI,
@@ -844,13 +843,16 @@
         AttachmentColumns.PREVIEW_INTENT
     };
     private static final String EMAIL_SEPARATOR_PATTERN = "\n";
-    public static final int ATTACHMENT_ID_COLUMN = 0;
-    public static final int ATTACHMENT_NAME_COLUMN = 1;
-    public static final int ATTACHMENT_SIZE_COLUMN = 2;
-    public static final int ATTACHMENT_URI_COLUMN = 3;
-    public static final int ATTACHMENT_ORIGIN_EXTRAS_COLUMN = 4;
-    public static final int ATTACHMENT_CONTENT_TYPE_COLUMN = 5;
-    public static final int ATTACHMENT_SYNCED_COLUMN = 6;
+    public static final int ATTACHMENT_NAME_COLUMN = 0;
+    public static final int ATTACHMENT_SIZE_COLUMN = 1;
+    public static final int ATTACHMENT_URI_COLUMN = 2;
+    public static final int ATTACHMENT_CONTENT_TYPE_COLUMN = 3;
+    public static final int ATTACHMENT_STATE_COLUMN = 4;
+    public static final int ATTACHMENT_DESTINATION_COLUMN = 5;
+    public static final int ATTACHMENT_DOWNLOADED_SIZE_COLUMN = 6;
+    public static final int ATTACHMENT_CONTENT_URI_COLUMN = 7;
+    public static final int ATTACHMENT_THUMBNAIL_URI_COLUMN = 8;
+    public static final int ATTACHMENT_PREVIEW_INTENT_COLUMN = 9;
 
     /**
      * Valid states for the {@link AttachmentColumns#STATE} column.