From 4f0882068315790a2b1dcd09814de9cea8639f4b Mon Sep 17 00:00:00 2001
From: Marcus Wolschon <Marcus.Wolschon@googlemail.com>
Date: Mon, 22 Nov 2010 08:12:48 +0000
Subject: [PATCH] http://code.google.com/p/k9mail/issues/detail?id=2682 mark
 multiple mails as SPAM

---
 res/drawable/ic_button_spam.png           | Bin 0 -> 1443 bytes
 res/layout/message_list.xml               |   7 +++++
 src/com/fsck/k9/activity/MessageList.java |  34 ++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 res/drawable/ic_button_spam.png

diff --git a/res/drawable/ic_button_spam.png b/res/drawable/ic_button_spam.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fe49ee6a76de53af8110827672f4cbe5b862867
GIT binary patch
literal 1443
zcmV;U1zh@xP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;!REbO3bmfr!}v000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igl3
z2nRcjih|$(00kpSL_t(Y$BmXtXk6zN$A8~_&O@4~G!e3=Rz@xIpg1;xP?rV;hi*!`
zX`wVBq>C<$yUL=F6tXB;bW^e_^`e0`5C{ZXO0y^w3ZbMpX&$bMh~$((wjPP)u_y9K
z^SF2Jcfapsp+{oJjeItj?;if=f6hJU{J*RC8WWM=&A+~R;`;UL(~feSyL`6(jrylg
z{@}?CrBw3&Vt8K@+`IVOi;uta;X8jSWD7YbaMYdyP++x{xBvb2V0&}>haz%GDW#7j
z5D^8SloB9pt+sys@Z7`2=IQ3O;&^cwNFcZ{Vx;u0&a|$!8jBl?FF(t(j|2KH{1*h>
zZr3jsi)#PuhzLLtDCWj<$%8WwUO4s8sTCkSz^yE=oZR?y<8Q@$aU3We1P82$q&qu1
zQYw|S5)lU|oj-s64V&6WM2R>!Sh14LWXm&iGw#h#Zf@`Pc5Q0X{j5BUZ=Bf^vz6g+
zXgb@S+sPnNN-0D{Ill9sSAPG>Q$SaVi2K^BuYGTEdGYU))k%Ec$HBoGix+r|=f^SD
z(C_upXgoZuviR1=8~4b%SqAX{Gct_Sh)_bdd)v%^bN>5J|Mcm9cmQD-`lay_Qxj7t
zrO;@6#|MFOwan(`CcQzAD2lMw;<_$D5RgeT*u14MRzT-96;mO0V=}o6VIlMmdLXAC
zI(?<H+o3#JZf7!?RYx3UFpT2ScP?MPOdQ8|OolOrD2j-ph}*YsbMD-^cU|RT#Y&=+
z*<Qc*z^Rj`t^lG^ohsLJ!(=C!?DRT?#3c68KQGOvUMig%oj>2WaRY#Qy-vMeCkO)4
zG-Ws(((QI>x7*BpYwpL9jd)_=iRHi#94B=8Q`M=qF=nLpGg8jp9)%ZwckxH7*H&N8
zhFJtb>%H+_SXkh_ci;QUoR1h05|WyfnVFeqF8ut$Ux3m6rxXvsbzRxt1H6pqR*Dt!
z`Mhkkw+=>+jg1W+{r01*udNfM5k9_nuBQM}lS*u2RW6m?d+xy<X7?V-S1O;+)9?2I
zSX*0TeSMu`vB>1)B-LtF<+8cojM7nf_1e|v#+)(4m7}FXtdQ6QooHrfXJu(=N$oEl
zB0{&@rQ7Y&YPA>}8+*RdXh<?hNP`s2SEa(a`-M_!uL=V}7@R+I=8O~yg?s8%zu#wR
zX-U<lYG6Q%KAIp+)59t}<5|~pf07Im&YnF>v)N>NdYWuDdk1EHeI0EzzV(kL5Ck!T
zSRqmo$|^}nSowH`d?x?1xw*N8!C<i4XfzHnQ4}FY?ymxcB9R2qf@eIm(pY0bgBC3c
zC4zA5*s(*5@B4`CC3f_EU_lv0Lc;RL%YT@dm|%W>o_sz}CX@N270YAaeN3&btsO!t
zl?sF2fK<|>2~xY)11pv!O4!`oytBZ&EDS>$jRqh5_X8Yp?(;@dV2!2OY|75gj_UXO
z#Bq$)8WF*DU2?e`)oPXF$B*;YzuuypDPxtrj~<93PGdw1?XC8&hSBi3t(#jIW0-ni
z>V@XX<}+KJt-)}2h}QZS?|=CIi%#M&vZK9T9Z`XeO)Q>xh%2;KTfZC*hPF0U0}G3b
zi!W{uw$l?6C-U0Se6;k@OP}q0rs~J*AYhG^FSOv^1X3&2+D4ni^E{_ksReNy<NJQ9
zJVmWm%f)ew_>zWB$aHNw6YCh?@zWp(Y_6PZ@BbFuyJ^;1b?erx@z(!ZO*e3J2b+B$
x6$fWud=e7A?01bjY|J&TR4SF8<2Z+a&jIr+uZ=R>K!pGR002ovPDHLkV1f#H!I=O6

literal 0
HcmV?d00001

diff --git a/res/layout/message_list.xml b/res/layout/message_list.xml
index 083fc383a..ca3c64298 100644
--- a/res/layout/message_list.xml
+++ b/res/layout/message_list.xml
@@ -30,6 +30,13 @@
             android:layout_weight="1"
             android:src="@drawable/ic_button_delete"
         />
+        <ImageButton
+            android:id="@+id/batch_spam_button"
+            android:layout_width="0dip"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:src="@drawable/ic_button_spam"
+        />
         <ImageButton
             android:id="@+id/batch_flag_button"
             android:layout_width="0dip"
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 10a44961b..cd56b70b6 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -312,9 +312,14 @@ public class MessageList
     private boolean mCheckboxes = true;
     private int mSelectedCount = 0;
 
+    /**
+     * Area with buttons visible when multiple
+     * mails are marked.
+     */
     private View mBatchButtonArea;
     private ImageButton mBatchReadButton;
     private ImageButton mBatchDeleteButton;
+    private ImageButton mBatchSpamButton;
     private ImageButton mBatchFlagButton;
     private ImageButton mBatchDoneButton;
 
@@ -900,10 +905,13 @@ public class MessageList
         mBatchReadButton.setOnClickListener(this);
         mBatchDeleteButton = (ImageButton) findViewById(R.id.batch_delete_button);
         mBatchDeleteButton.setOnClickListener(this);
+        mBatchSpamButton = (ImageButton) findViewById(R.id.batch_spam_button);
+        mBatchSpamButton.setOnClickListener(this);
         mBatchFlagButton = (ImageButton) findViewById(R.id.batch_flag_button);
         mBatchFlagButton.setOnClickListener(this);
         mBatchDoneButton = (ImageButton) findViewById(R.id.batch_done_button);
 
+
         mBatchDoneButton.setOnClickListener(this);
 
         // Gesture detection
@@ -2960,6 +2968,16 @@ public class MessageList
             Animation animation = AnimationUtils.loadAnimation(this, R.anim.footer_appear);
             animation.setAnimationListener(this);
             mBatchButtonArea.startAnimation(animation);
+
+            
+    		// hide spam button if there is no spam folder
+            if (mAccount != null) {
+            	String folderName = mAccount.getSpamFolderName();
+            	if (K9.FOLDER_NONE.equalsIgnoreCase(folderName)
+            			|| !mController.isMoveCapable(mAccount)) {
+            		mBatchSpamButton.setVisibility(View.GONE);
+            	}
+            }
         }
     }
 
@@ -3065,6 +3083,7 @@ public class MessageList
     {
         boolean newState = false;
         List<Message> messageList = new ArrayList<Message>();
+        // messages to be removed from the view
         List<MessageInfoHolder> removeHolderList = new ArrayList<MessageInfoHolder>();
 
         if (v == mBatchDoneButton)
@@ -3092,6 +3111,10 @@ public class MessageList
                     {
                         removeHolderList.add(holder);
                     }
+                    else if (v == mBatchSpamButton)
+                    {
+                        removeHolderList.add(holder);
+                    }
                     else if (v == mBatchFlagButton)
                     {
                         holder.flagged = newState;
@@ -3114,6 +3137,17 @@ public class MessageList
                 mSelectedCount = 0;
                 toggleBatchButtons();
             }
+            else if (v == mBatchSpamButton)
+            {
+                String folderName = mAccount.getSpamFolderName();
+                if (K9.FOLDER_NONE.equalsIgnoreCase(folderName))
+                {
+                    return;
+                }
+                mController.moveMessages(mAccount, mCurrentFolder.name, messageList.toArray(EMPTY_MESSAGE_ARRAY), folderName, null);
+                mSelectedCount = 0;
+                toggleBatchButtons();
+            }
             else
             {
                 mController.setFlag(messageList.toArray(EMPTY_MESSAGE_ARRAY), (v == mBatchReadButton ? Flag.SEEN : Flag.FLAGGED), newState);