From 49c2708f4c0dae673b3941e407881f1a3d546827 Mon Sep 17 00:00:00 2001 From: Daniel Applebaum Date: Thu, 12 Mar 2009 01:13:26 +0000 Subject: [PATCH] Patch ImapFolders.r389.patch submitted in Comment 3 of Issue 214 by dumbfile on Feb 28, 2009. One change of my own, putting the actual folders name outside the parentheses, and the functional/special name inside the parentheses. --- res/layout/account_setup_incoming.xml | 24 +++++++++++++++++++ res/values-de-rDE/strings.xml | 10 ++++++++ res/values/strings.xml | 12 ++++++++++ .../email/activity/FolderMessageList.java | 21 ++++++++++++++++ .../activity/setup/AccountSetupIncoming.java | 19 +++++++++++++++ 5 files changed, 86 insertions(+) diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml index 8a790d7e3..9b2da73f2 100644 --- a/res/layout/account_setup_incoming.xml +++ b/res/layout/account_setup_incoming.xml @@ -94,6 +94,30 @@ android:layout_height="wrap_content" android:layout_width="fill_parent" /> + + + + + + + + + + Nie Optional Präfix für IMAP-Verzeichnis + Ordner für Entwürfe + Ordner für Gesendete + Ordner für Papierkorb + Ordner für Postausgang IMAP-Server Kennwort POP3-Server @@ -185,6 +189,12 @@ Postausgang Gesendet Papierkorb + + %s (Entwürfe) + %s (Postausgang) + %s (Gesendet) + %s (Papierkorb) + Fehler Laden\u2026 Laden von Nachrichten\u2026 diff --git a/res/values/strings.xml b/res/values/strings.xml index 9a1b1cdc0..b082aa652 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -116,6 +116,12 @@ Drafts Trash Sent + + + %s (Outbox) + %s (Drafts) + %s (Trash) + %s (Sent) No more messages @@ -245,6 +251,12 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based IMAP path prefix Optional + + Drafts folder name + Sent folder name + Trash folder name + Outbox folder name + WebDav(Exchange) path Optional diff --git a/src/com/android/email/activity/FolderMessageList.java b/src/com/android/email/activity/FolderMessageList.java index 346409a4e..b50027a93 100644 --- a/src/com/android/email/activity/FolderMessageList.java +++ b/src/com/android/email/activity/FolderMessageList.java @@ -1477,8 +1477,29 @@ public class FolderMessageList extends ExpandableListActivity } if (holder.name.equals(mAccount.getOutboxFolderName())) { + holder.displayName = String.format( + getString(R.string.special_mailbox_name_outbox_fmt), + holder.name); holder.outbox = true; } + if (holder.name.equals(mAccount.getDraftsFolderName())) + { + holder.displayName = String.format( + getString(R.string.special_mailbox_name_drafts_fmt), + holder.name); + } + if (holder.name.equals(mAccount.getTrashFolderName())) + { + holder.displayName = String.format( + getString(R.string.special_mailbox_name_trash_fmt), + holder.name); + } + if (holder.name.equals(mAccount.getSentFolderName())) + { + holder.displayName = String.format( + getString(R.string.special_mailbox_name_sent_fmt), + holder.name); + } if (holder.messages == null) { holder.messages = new ArrayList(); diff --git a/src/com/android/email/activity/setup/AccountSetupIncoming.java b/src/com/android/email/activity/setup/AccountSetupIncoming.java index 67b16920c..52c5eef53 100644 --- a/src/com/android/email/activity/setup/AccountSetupIncoming.java +++ b/src/com/android/email/activity/setup/AccountSetupIncoming.java @@ -60,6 +60,10 @@ public class AccountSetupIncoming extends Activity implements OnClickListener { private Spinner mSecurityTypeView; private Spinner mDeletePolicyView; private EditText mImapPathPrefixView; + private EditText mImapFolderDrafts; + private EditText mImapFolderSent; + private EditText mImapFolderTrash; + private EditText mImapFolderOutbox; private EditText mWebdavPathPrefixView; private EditText mWebdavAuthPathView; private EditText mWebdavMailboxPathView; @@ -94,6 +98,10 @@ public class AccountSetupIncoming extends Activity implements OnClickListener { mSecurityTypeView = (Spinner)findViewById(R.id.account_security_type); mDeletePolicyView = (Spinner)findViewById(R.id.account_delete_policy); mImapPathPrefixView = (EditText)findViewById(R.id.imap_path_prefix); + mImapFolderDrafts = (EditText)findViewById(R.id.account_imap_folder_drafts); + mImapFolderSent = (EditText)findViewById(R.id.account_imap_folder_sent); + mImapFolderTrash = (EditText)findViewById(R.id.account_imap_folder_trash); + 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); @@ -209,6 +217,7 @@ public class AccountSetupIncoming extends Activity implements OnClickListener { mAccountSchemes = popSchemes; findViewById(R.id.imap_path_prefix_section).setVisibility(View.GONE); + findViewById(R.id.imap_folder_setup_section).setVisibility(View.GONE); findViewById(R.id.webdav_path_prefix_section).setVisibility(View.GONE); findViewById(R.id.webdav_path_debug_section).setVisibility(View.GONE); } else if (uri.getScheme().startsWith("imap")) { @@ -221,6 +230,11 @@ public class AccountSetupIncoming extends Activity implements OnClickListener { } findViewById(R.id.webdav_path_prefix_section).setVisibility(View.GONE); findViewById(R.id.webdav_path_debug_section).setVisibility(View.GONE); + + mImapFolderDrafts.setText(mAccount.getDraftsFolderName()); + mImapFolderSent.setText(mAccount.getSentFolderName()); + mImapFolderTrash.setText(mAccount.getTrashFolderName()); + mImapFolderOutbox.setText(mAccount.getOutboxFolderName()); } else if (uri.getScheme().startsWith("webdav")) { serverLabelView.setText(R.string.account_setup_incoming_webdav_server_label); mAccountPorts = webdavPorts; @@ -228,6 +242,7 @@ public class AccountSetupIncoming extends Activity implements OnClickListener { /** Hide the unnecessary fields */ findViewById(R.id.imap_path_prefix_section).setVisibility(View.GONE); + findViewById(R.id.imap_folder_setup_section).setVisibility(View.GONE); if (uri.getPath() != null && uri.getPath().length() > 0) { String[] pathParts = uri.getPath().split("\\|"); @@ -368,6 +383,10 @@ public class AccountSetupIncoming extends Activity implements OnClickListener { int deleteSpinnerVal = (Integer)((SpinnerOption)mDeletePolicyView.getSelectedItem()).value; + mAccount.setDraftsFolderName(mImapFolderDrafts.getText().toString()); + mAccount.setSentFolderName(mImapFolderSent.getText().toString()); + mAccount.setTrashFolderName(mImapFolderTrash.getText().toString()); + mAccount.setOutboxFolderName(mImapFolderOutbox.getText().toString()); mAccount.setDeletePolicy(deleteSpinnerVal); AccountSetupCheckSettings.actionCheckSettings(this, mAccount, true, false); }