From 9deea3342637f5bfd3cb89194297cdcc6f6131f9 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Fri, 11 Feb 2011 12:10:45 -0500
Subject: [PATCH] re-enable setOnFlagListener

---
 src/com/fsck/k9/activity/MessageView.java   |  6 ++++++
 src/com/fsck/k9/view/SingleMessageView.java | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index d5776cfd1..ee4a488bd 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -1137,6 +1137,12 @@ public class MessageView extends K9Activity implements OnClickListener {
                         mMessageView.loadBodyFromUrl("file:///android_asset/downloading.html");
                     }
                     mMessageView.setHeaders(message, account);
+                    mMessageView.setOnFlagListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            onFlag();
+                        }
+                    });
                 }
             });
         }
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index ae0eded72..163c5b2e1 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -91,13 +91,8 @@ public class SingleMessageView extends LinearLayout {
     public void setHeaders(final Message message, Account account) {
         try {
             mHeaderContainer.populate(message, account);
-            mHeaderContainer.setOnFlagListener(new OnClickListener() {
-                @Override public void onClick(View v) {
-                    if (message != null) {
-                        //TODO: reenable onFlag();
-                    }
-                }
-            });
+
+
         } catch (Exception me) {
             Log.e(K9.LOG_TAG, "setHeaders - error", me);
         }
@@ -108,6 +103,11 @@ public class SingleMessageView extends LinearLayout {
             mDownloadRemainder.setVisibility(View.VISIBLE);
         }
     }
+
+    public void setOnFlagListener(OnClickListener listener) {
+        mHeaderContainer.setOnFlagListener(listener);
+    }
+
     public void showAllHeaders() {
         mHeaderContainer.onShowAdditionalHeaders();
     }