From 4fa4f22f2cb8671878c244445603927e946381d7 Mon Sep 17 00:00:00 2001
From: Daniel Applebaum <danapple@danapple.com>
Date: Sat, 6 Feb 2010 22:36:22 +0000
Subject: [PATCH] Fixes Issue 494

Allow for setting the Outbox to have any name, as tying it to a server
side folder does not make sense.  It is never synced.
---
 res/layout/account_setup_incoming.xml              |  9 +++++++--
 .../k9/activity/setup/AccountSetupIncoming.java    | 14 ++------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml
index 9e8ac229a..fc670093c 100644
--- a/res/layout/account_setup_incoming.xml
+++ b/res/layout/account_setup_incoming.xml
@@ -126,8 +126,13 @@
             <TextView android:layout_height="wrap_content"
                 android:text="@string/account_setup_incoming_imap_folder_outbox"
                 android:layout_width="fill_parent"></TextView>
-            <Button android:layout_height="wrap_content"
-                android:id="@+id/account_imap_folder_outbox" android:layout_width="fill_parent"></Button>
+            <EditText
+                android:id="@+id/account_imap_folder_outbox"
+                android:singleLine="true"
+                android:inputType="number"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+                
         </LinearLayout>
         <LinearLayout
             android:id="@+id/webdav_path_prefix_section"
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java b/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
index c29025a09..46c99038d 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
@@ -73,7 +73,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
     private Button mImapFolderDrafts;
     private Button mImapFolderSent;
     private Button mImapFolderTrash;
-    private Button mImapFolderOutbox;
+    private EditText mImapFolderOutbox;
     private EditText mWebdavPathPrefixView;
     private EditText mWebdavAuthPathView;
     private EditText mWebdavMailboxPathView;
@@ -114,7 +114,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
         mImapFolderDrafts = (Button)findViewById(R.id.account_imap_folder_drafts);
         mImapFolderSent = (Button)findViewById(R.id.account_imap_folder_sent);
         mImapFolderTrash = (Button)findViewById(R.id.account_imap_folder_trash);
-        mImapFolderOutbox = (Button)findViewById(R.id.account_imap_folder_outbox);
+        mImapFolderOutbox = (EditText)findViewById(R.id.account_imap_folder_outbox);
         mWebdavPathPrefixView = (EditText)findViewById(R.id.webdav_path_prefix);
         mWebdavAuthPathView = (EditText)findViewById(R.id.webdav_auth_path);
         mWebdavMailboxPathView = (EditText)findViewById(R.id.webdav_mailbox_path);
@@ -123,7 +123,6 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
         mImapFolderDrafts.setOnClickListener(this);
         mImapFolderSent.setOnClickListener(this);
         mImapFolderTrash.setOnClickListener(this);
-        mImapFolderOutbox.setOnClickListener(this);
         mNextButton.setOnClickListener(this);
 
         SpinnerOption securityTypes[] =
@@ -424,9 +423,6 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
                 case SELECT_TRASH_FOLDER:
                     mImapFolderTrash.setText(data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER));
                     return;
-                case SELECT_OUTBOX_FOLDER:
-                    mImapFolderOutbox.setText(data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER));
-                    return;
             }
             if (Intent.ACTION_EDIT.equals(getIntent().getAction()))
             {
@@ -548,9 +544,6 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
                 case R.id.account_imap_folder_trash:
                     selectImapFolder(SELECT_TRASH_FOLDER);
                     break;
-                case R.id.account_imap_folder_outbox:
-                    selectImapFolder(SELECT_OUTBOX_FOLDER);
-                    break;
             }
         }
         catch (Exception e)
@@ -573,9 +566,6 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
             case SELECT_TRASH_FOLDER:
                 curFolder = mImapFolderTrash.getText().toString();
                 break;
-            case SELECT_OUTBOX_FOLDER:
-                curFolder = mImapFolderOutbox.getText().toString();
-                break;
             default:
                 throw new IllegalArgumentException(
                     "Cannot select folder for: " + activityCode);