From 9796cb64874f044c1edfdf8aca970126eb4d2970 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Sun, 27 Dec 2009 16:50:14 +0000
Subject: [PATCH] First rouind of extracting the "load messages from the db"
 column list

---
 src/com/fsck/k9/mail/store/LocalStore.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java
index 968f5f3b7..62c4434c9 100644
--- a/src/com/fsck/k9/mail/store/LocalStore.java
+++ b/src/com/fsck/k9/mail/store/LocalStore.java
@@ -561,6 +561,16 @@ public class LocalStore extends Store implements Serializable
         private String prefId = null;
         private String mPushState = null;
 
+        /*
+         * a String containing the columns getMessages expects to work with
+         * in the correct order.
+         */
+        private String GET_MESSAGES_COLS =
+
+            "subject, sender_list, date, uid, flags, id, to_list, cc_list, "
+            + "bcc_list, reply_to_list, attachment_count, internal_date, message_id ";
+
+
         public LocalFolder(String name)
         {
             this.mName = name;
@@ -1217,9 +1227,9 @@ public class LocalStore extends Store implements Serializable
             try
             {
                 cursor = mDb.rawQuery(
-                             "SELECT subject, sender_list, date, uid, flags, id, to_list, cc_list, "
-                             + "bcc_list, reply_to_list, attachment_count, internal_date, message_id "
-                             + "FROM messages " + "WHERE uid = ? " + "AND folder_id = ?",
+                             "SELECT "
+                             + GET_MESSAGES_COLS
+                             + "FROM messages WHERE uid = ? AND folder_id = ?",
                              new String[]
                              {
                                  message.getUid(), Long.toString(mFolderId)