From caa02b16ebccc12af7f346035322e78ef783cf81 Mon Sep 17 00:00:00 2001
From: Chris Banes <chris@senab.co.uk>
Date: Thu, 1 Sep 2011 11:57:06 +0100
Subject: [PATCH] Expose SenderAddress through ContentProvider. Issue: 3665

---
 src/com/fsck/k9/provider/MessageProvider.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/src/com/fsck/k9/provider/MessageProvider.java
index c42c63ba0..e33021705 100644
--- a/src/com/fsck/k9/provider/MessageProvider.java
+++ b/src/com/fsck/k9/provider/MessageProvider.java
@@ -60,6 +60,11 @@ public class MessageProvider extends ContentProvider {
          * <P>Type: TEXT</P>
          */
         String SENDER = "sender";
+        
+        /**
+         * <P>Type: TEXT</P>
+         */
+        String SENDER_ADDRESS = "senderAddress";
 
         /**
          * <P>Type: TEXT</P>
@@ -179,6 +184,12 @@ public class MessageProvider extends ContentProvider {
             return source.sender;
         }
     }
+    public static class SenderAddressExtractor implements FieldExtractor<MessageInfoHolder, String> {
+        @Override
+        public String getField(final MessageInfoHolder source) {
+            return source.senderAddress;
+        }
+    }
     public static class AccountExtractor implements FieldExtractor<MessageInfoHolder, String> {
         @Override
         public String getField(final MessageInfoHolder source) {
@@ -290,6 +301,8 @@ public class MessageProvider extends ContentProvider {
                     extractors.put(field, new SubjectExtractor());
                 } else if (MessageColumns.SENDER.equals(field)) {
                     extractors.put(field, new SenderExtractor());
+                } else if (MessageColumns.SENDER_ADDRESS.equals(field)) {
+                    extractors.put(field, new SenderAddressExtractor());
                 } else if (MessageColumns.SEND_DATE.equals(field)) {
                     extractors.put(field, new SendDateExtractor());
                 } else if (MessageColumns.PREVIEW.equals(field)) {
@@ -814,6 +827,7 @@ public class MessageProvider extends ContentProvider {
         MessageColumns._ID,
         MessageColumns.SEND_DATE,
         MessageColumns.SENDER,
+        MessageColumns.SENDER_ADDRESS,
         MessageColumns.SUBJECT,
         MessageColumns.PREVIEW,
         MessageColumns.ACCOUNT,