From 60a538e0717f0a4b3cfe2c908090b0d34613dbb6 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Sat, 27 Nov 2010 04:03:02 +0000
Subject: [PATCH] Remove "preview" form messageinfoholder

---
 src/com/fsck/k9/activity/MessageInfoHolder.java | 1 -
 src/com/fsck/k9/activity/MessageList.java       | 4 +++-
 src/com/fsck/k9/helper/MessageHelper.java       | 1 -
 src/com/fsck/k9/provider/MessageProvider.java   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/fsck/k9/activity/MessageInfoHolder.java b/src/com/fsck/k9/activity/MessageInfoHolder.java
index f618f2e47..de4a3441c 100644
--- a/src/com/fsck/k9/activity/MessageInfoHolder.java
+++ b/src/com/fsck/k9/activity/MessageInfoHolder.java
@@ -14,7 +14,6 @@ public class MessageInfoHolder
     public CharSequence sender;
     public String senderAddress;
     public String compareCounterparty;
-    public String preview;
     public String[] recipients;
     public String uid;
     public boolean read;
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 00abba36a..3c5dd4645 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -69,9 +69,11 @@ import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Message;
+import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.store.LocalStore;
 import com.fsck.k9.mail.store.StorageManager;
 import com.fsck.k9.mail.store.LocalStore.LocalFolder;
+import com.fsck.k9.mail.store.LocalStore.LocalMessage;
 
 /**
  * MessageList is the primary user interface for the program. This Activity
@@ -2778,7 +2780,7 @@ public class MessageList
                  * from.
                  */
 
-                holder.preview.setText(new SpannableStringBuilder(recipientSigil(message)).append(message.sender).append(" ").append(message.preview),
+                holder.preview.setText(new SpannableStringBuilder(recipientSigil(message)).append(message.sender).append(" ").append(message.message.getPreview()),
                                        TextView.BufferType.SPANNABLE);
                 Spannable str = (Spannable)holder.preview.getText();
 
diff --git a/src/com/fsck/k9/helper/MessageHelper.java b/src/com/fsck/k9/helper/MessageHelper.java
index bea2dd381..2ad905bc9 100644
--- a/src/com/fsck/k9/helper/MessageHelper.java
+++ b/src/com/fsck/k9/helper/MessageHelper.java
@@ -121,7 +121,6 @@ public class MessageHelper
             target.subject = message.getSubject();
 
             target.uid = message.getUid();
-            target.preview = message.getPreview();
 
             target.account = account.getDescription();
             target.uri = "email://messages/" + account.getAccountNumber() + "/" + m.getFolder().getName() + "/" + m.getUid();
diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/src/com/fsck/k9/provider/MessageProvider.java
index 01ffb3ed4..e337a466f 100644
--- a/src/com/fsck/k9/provider/MessageProvider.java
+++ b/src/com/fsck/k9/provider/MessageProvider.java
@@ -165,7 +165,7 @@ public class MessageProvider extends ContentProvider
         @Override
         public String getField(final MessageInfoHolder source)
         {
-            return source.preview;
+            return source.message.getPreview();
         }
     }
     public static class UriExtractor implements FieldExtractor<MessageInfoHolder, String>