moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-17 07:30:16 -05:00
Code Issues Releases Wiki Activity

Fixes Issue 494

Browse Source 
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.
This commit is contained in:
Daniel Applebaum 2010-02-06 22:36:22 +00:00
parent d7da5db3e7
commit 4fa4f22f2c
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
res/layout/account_setup_incoming.xml
View File

@ -126,8 +126,13 @@
<TextView android:layout_height="wrap_content" <TextView android:layout_height="wrap_content"
android:text="@string/account_setup_incoming_imap_folder_outbox" android:text="@string/account_setup_incoming_imap_folder_outbox"
android:layout_width="fill_parent"></TextView> android:layout_width="fill_parent"></TextView>
<Button android:layout_height="wrap_content" <EditText
android:id="@+id/account_imap_folder_outbox" android:layout_width="fill_parent"></Button> 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>
<LinearLayout <LinearLayout
android:id="@+id/webdav_path_prefix_section" android:id="@+id/webdav_path_prefix_section"

14
src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
View File

@ -73,7 +73,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
private Button mImapFolderDrafts; private Button mImapFolderDrafts;
private Button mImapFolderSent; private Button mImapFolderSent;
private Button mImapFolderTrash; private Button mImapFolderTrash;
private Button mImapFolderOutbox; private EditText mImapFolderOutbox;
private EditText mWebdavPathPrefixView; private EditText mWebdavPathPrefixView;
private EditText mWebdavAuthPathView; private EditText mWebdavAuthPathView;
private EditText mWebdavMailboxPathView; private EditText mWebdavMailboxPathView;
@ -114,7 +114,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
mImapFolderDrafts = (Button)findViewById(R.id.account_imap_folder_drafts); mImapFolderDrafts = (Button)findViewById(R.id.account_imap_folder_drafts);
mImapFolderSent = (Button)findViewById(R.id.account_imap_folder_sent); mImapFolderSent = (Button)findViewById(R.id.account_imap_folder_sent);
mImapFolderTrash = (Button)findViewById(R.id.account_imap_folder_trash); 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); mWebdavPathPrefixView = (EditText)findViewById(R.id.webdav_path_prefix);
mWebdavAuthPathView = (EditText)findViewById(R.id.webdav_auth_path); mWebdavAuthPathView = (EditText)findViewById(R.id.webdav_auth_path);
mWebdavMailboxPathView = (EditText)findViewById(R.id.webdav_mailbox_path); mWebdavMailboxPathView = (EditText)findViewById(R.id.webdav_mailbox_path);
@ -123,7 +123,6 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
mImapFolderDrafts.setOnClickListener(this); mImapFolderDrafts.setOnClickListener(this);
mImapFolderSent.setOnClickListener(this); mImapFolderSent.setOnClickListener(this);
mImapFolderTrash.setOnClickListener(this); mImapFolderTrash.setOnClickListener(this);
mImapFolderOutbox.setOnClickListener(this);
mNextButton.setOnClickListener(this); mNextButton.setOnClickListener(this);
SpinnerOption securityTypes[] = SpinnerOption securityTypes[] =
@ -424,9 +423,6 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
case SELECT_TRASH_FOLDER: case SELECT_TRASH_FOLDER:
mImapFolderTrash.setText(data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER)); mImapFolderTrash.setText(data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER));
return; return;
case SELECT_OUTBOX_FOLDER:
mImapFolderOutbox.setText(data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER));
return;
} }
if (Intent.ACTION_EDIT.equals(getIntent().getAction())) 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: case R.id.account_imap_folder_trash:
selectImapFolder(SELECT_TRASH_FOLDER); selectImapFolder(SELECT_TRASH_FOLDER);
break; break;
case R.id.account_imap_folder_outbox:
selectImapFolder(SELECT_OUTBOX_FOLDER);
break;
} }
} }
catch (Exception e) catch (Exception e)
@ -573,9 +566,6 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
case SELECT_TRASH_FOLDER: case SELECT_TRASH_FOLDER:
curFolder = mImapFolderTrash.getText().toString(); curFolder = mImapFolderTrash.getText().toString();
break; break;
case SELECT_OUTBOX_FOLDER:
curFolder = mImapFolderOutbox.getText().toString();
break;
default: default:
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Cannot select folder for: " + activityCode); "Cannot select folder for: " + activityCode);