From 8488b55e09e41c1a7834c7f80fc4f75d3957f36b Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Sun, 26 Dec 2010 03:49:13 +0000
Subject: [PATCH] remove some duplicated code

---
 src/com/fsck/k9/activity/MessageView.java | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index de67819da..065b551d6 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -1507,18 +1507,14 @@ public class MessageView extends K9Activity implements OnClickListener
             toast.show();
             return;
         }
-        Intent intent = new Intent(this, ChooseFolder.class);
-        intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, mAccount.getUuid());
-        intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, mMessageReference.folderName);
-        intent.putExtra(ChooseFolder.EXTRA_SEL_FOLDER, mAccount.getLastSelectedFolderName());
-        intent.putExtra(ChooseFolder.EXTRA_MESSAGE, mMessageReference);
-        startActivityForResult(intent, ACTIVITY_CHOOSE_FOLDER_MOVE);
+
+        startRefileActivity(ACTIVITY_CHOOSE_FOLDER_MOVE);
     }
 
     private void onCopy()
     {
         if ((!MessagingController.getInstance(getApplication()).isCopyCapable(mAccount))
-                || (mMessage == null))
+            || (mMessage == null))
         {
             return;
         }
@@ -1528,18 +1524,27 @@ public class MessageView extends K9Activity implements OnClickListener
             toast.show();
             return;
         }
+
+        startRefileActivity(ACTIVITY_CHOOSE_FOLDER_COPY);
+    }
+
+    private void startRefileActivity(int activity)
+    {
         Intent intent = new Intent(this, ChooseFolder.class);
         intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, mAccount.getUuid());
         intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, mMessageReference.folderName);
         intent.putExtra(ChooseFolder.EXTRA_SEL_FOLDER, mAccount.getLastSelectedFolderName());
         intent.putExtra(ChooseFolder.EXTRA_MESSAGE, mMessageReference);
-        startActivityForResult(intent, ACTIVITY_CHOOSE_FOLDER_COPY);
+        startActivityForResult(intent, activity);
+
+
+
     }
 
+
     private void onShowAdditionalHeaders()
     {
         int currentVisibility = mAdditionalHeadersView.getVisibility();
-
         if (currentVisibility == View.VISIBLE)
         {
             mHandler.hideAdditionalHeaders();