moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Added account settings for "archive" and "spam" folders. See issue 3.

This commit is contained in:
Thialfihar 2010-07-04 13:48:06 +00:00
parent 5c3f366661
commit 03b28c8b68
8 changed files with 318 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/layout/account_setup_incoming.xml
View File

@ -110,6 +110,11 @@
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:id="@+id/imap_folder_setup_section"
android:orientation="vertical">
<TextView android:layout_height="wrap_content"
android:text="@string/account_setup_incoming_imap_folder_archive"
android:layout_width="fill_parent"></TextView>
<Button android:layout_height="wrap_content"
android:id="@+id/account_imap_folder_archive" android:layout_width="fill_parent"></Button>
<TextView android:layout_height="wrap_content"
android:text="@string/account_setup_incoming_imap_folder_drafts"
android:layout_width="fill_parent"></TextView>
@ -120,6 +125,11 @@
android:layout_width="fill_parent"></TextView>
<Button android:layout_height="wrap_content"
android:id="@+id/account_imap_folder_sent" android:layout_width="fill_parent"></Button>
<TextView android:layout_height="wrap_content"
android:text="@string/account_setup_incoming_imap_folder_spam"
android:layout_width="fill_parent"></TextView>
<Button android:layout_height="wrap_content"
android:id="@+id/account_imap_folder_spam" android:layout_width="fill_parent"></Button>
<TextView android:layout_height="wrap_content"
android:text="@string/account_setup_incoming_imap_folder_trash"
android:layout_width="fill_parent"></TextView>

10
res/values-de/strings.xml
View File

@ -45,6 +45,7 @@
<string name="reply_all_action">Allen antworten</string>
<string name="delete_action">Löschen</string>
<string name="archive_action">Sichern</string>
<string name="spam_action">Spam</string>
<string name="delete_all_action">Ordner leeren</string>
<string name="forward_action">Weiterleiten</string>
<string name="move_action">Verschieben</string>
@ -157,12 +158,16 @@
<string name="special_mailbox_name_drafts">Entwürfe</string>
<string name="special_mailbox_name_trash">Papierkorb</string>
<string name="special_mailbox_name_sent">Gesendet</string>
<string name="special_mailbox_name_archive">Archiv</string>
<string name="special_mailbox_name_spam">Spam</string>
<!-- Mailbox names displayed to user -->
<string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Postausgang)</string>
<string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Entwürfe)</string>
<string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Papierkorb)</string>
<string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Gesendet)</string>
<string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Archiv)</string>
<string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string>
<string name="send_failure_subject">Fehler beim Senden von Nachrichten</string>
<string name="send_failure_body_abbrev">Sehen Sie bitte im Ordner <xliff:g id="errorFolder">%s</xliff:g> für Details nach.</string>
@ -245,6 +250,9 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="message_view_attachment_download_action">Speichern</string>
<string name="message_view_prev_action">\u25BC</string>
<string name="message_view_next_action">\u25B2</string>
<string name="message_view_archive_action">Sichern</string>
<string name="message_view_move_action">Verschieben</string>
<string name="message_view_spam_action">Spam</string>
<string name="message_view_datetime_fmt">dd. MMM yyyy HH:mm</string>
<string name="message_view_status_attachment_saved">Anlage auf SD-Karte gespeichert als <xliff:g id="filename">%s</xliff:g>.</string>
<string name="message_view_status_attachment_not_saved">Anlage konnte nicht auf SD-Karte gespeichert werden.</string>
@ -343,6 +351,8 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_setup_incoming_imap_folder_drafts">Ordner für Entwürfe</string>
<string name="account_setup_incoming_imap_folder_sent">Ordner für gesendete Objekte</string>
<string name="account_setup_incoming_imap_folder_trash">Ordner für gelöschte Objekte</string>
<string name="account_setup_incoming_imap_folder_archive">Ordner für archivierte Objekte</string>
<string name="account_setup_incoming_imap_folder_spam">Ordner für Spam</string>
<string name="account_setup_incoming_imap_folder_outbox">Ordner für ausgehende Objekte</string>
<string name="account_setup_auto_expand_folder">Autom. Startordner</string>

7
res/values/strings.xml
View File

@ -162,12 +162,16 @@
<string name="special_mailbox_name_drafts">Drafts</string>
<string name="special_mailbox_name_trash">Trash</string>
<string name="special_mailbox_name_sent">Sent</string>
<string name="special_mailbox_name_archive">Archive</string>
<string name="special_mailbox_name_spam">Spam</string>
<!-- Mailbox names displayed to user -->
<string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Outbox)</string>
<string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Drafts)</string>
<string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Trash)</string>
<string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Sent)</string>
<string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Archive)</string>
<string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string>
<string name="send_failure_subject">Failed to send some messages</string>
<string name="send_failure_body_abbrev">See your <xliff:g id="errorFolder">%s</xliff:g> folder for details.</string>
@ -371,6 +375,8 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_setup_incoming_imap_folder_drafts">Drafts folder name</string>
<string name="account_setup_incoming_imap_folder_sent">Sent folder name</string>
<string name="account_setup_incoming_imap_folder_trash">Trash folder name</string>
<string name="account_setup_incoming_imap_folder_archive">Archive folder name</string>
<string name="account_setup_incoming_imap_folder_spam">Spam folder name</string>
<string name="account_setup_incoming_imap_folder_outbox">Outbox folder name</string>
<string name="account_setup_incoming_subscribed_folders_only_label">Show only subscribed folders</string>
@ -480,7 +486,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_settings_notification_opens_unread_label">Notification opens unread messages</string>
<string name="account_settings_notification_opens_unread_summary">Searches for unread messages when Notification is opened</string>
<string name="account_settings_hide_buttons_label">Scroll navigation buttons</string>
<string name="account_settings_hide_buttons_never">Never</string>
<string name="account_settings_hide_buttons_keyboard_avail">When keyboard is available</string>

32
src/com/fsck/k9/Account.java
View File

@ -72,6 +72,8 @@ public class Account implements BaseAccount
private String mDraftsFolderName;
private String mSentFolderName;
private String mTrashFolderName;
private String mArchiveFolderName;
private String mSpamFolderName;
private String mOutboxFolderName;
private String mAutoExpandFolderName;
private FolderMode mFolderDisplayMode;
@ -213,6 +215,10 @@ public class Account implements BaseAccount
"Sent");
mTrashFolderName = preferences.getPreferences().getString(mUuid + ".trashFolderName",
"Trash");
mArchiveFolderName = preferences.getPreferences().getString(mUuid + ".archiveFolderName",
"Archive");
mSpamFolderName = preferences.getPreferences().getString(mUuid + ".spamFolderName",
"Spam");
mOutboxFolderName = preferences.getPreferences().getString(mUuid + ".outboxFolderName",
"Outbox");
mExpungePolicy = preferences.getPreferences().getString(mUuid + ".expungePolicy", EXPUNGE_IMMEDIATELY);
@ -380,6 +386,8 @@ public class Account implements BaseAccount
editor.remove(mUuid + ".draftsFolderName");
editor.remove(mUuid + ".sentFolderName");
editor.remove(mUuid + ".trashFolderName");
editor.remove(mUuid + ".archiveFolderName");
editor.remove(mUuid + ".spamFolderName");
editor.remove(mUuid + ".outboxFolderName");
editor.remove(mUuid + ".autoExpandFolderName");
editor.remove(mUuid + ".accountNumber");
@ -470,6 +478,8 @@ public class Account implements BaseAccount
editor.putString(mUuid + ".draftsFolderName", mDraftsFolderName);
editor.putString(mUuid + ".sentFolderName", mSentFolderName);
editor.putString(mUuid + ".trashFolderName", mTrashFolderName);
editor.putString(mUuid + ".archiveFolderName", mArchiveFolderName);
editor.putString(mUuid + ".spamFolderName", mSpamFolderName);
editor.putString(mUuid + ".outboxFolderName", mOutboxFolderName);
editor.putString(mUuid + ".autoExpandFolderName", mAutoExpandFolderName);
editor.putInt(mUuid + ".accountNumber", mAccountNumber);
@ -536,6 +546,8 @@ public class Account implements BaseAccount
if (folder.getName().equals(K9.INBOX) || (
folder.getName().equals(getTrashFolderName()) == false &&
folder.getName().equals(getDraftsFolderName()) == false &&
folder.getName().equals(getArchiveFolderName()) == false &&
folder.getName().equals(getSpamFolderName()) == false &&
folder.getName().equals(getOutboxFolderName()) == false &&
folder.getName().equals(getSentFolderName()) == false &&
folder.getName().equals(getErrorFolderName()) == false))
@ -853,6 +865,26 @@ public class Account implements BaseAccount
mTrashFolderName = trashFolderName;
}
public synchronized String getArchiveFolderName()
{
return mArchiveFolderName;
}
public synchronized void setArchiveFolderName(String archiveFolderName)
{
mArchiveFolderName = archiveFolderName;
}
public synchronized String getSpamFolderName()
{
return mSpamFolderName;
}
public synchronized void setSpamFolderName(String spamFolderName)
{
mSpamFolderName = spamFolderName;
}
public synchronized String getOutboxFolderName()
{
return mOutboxFolderName;

10
src/com/fsck/k9/activity/FolderList.java
View File

@ -1427,6 +1427,16 @@ public class FolderList extends K9ListActivity
this.displayName = String.format(getString(R.string.special_mailbox_name_sent_fmt), this.name);
}
if (this.name.equals(mAccount.getArchiveFolderName()))
{
this.displayName = String.format(getString(R.string.special_mailbox_name_archive_fmt), this.name);
}
if (this.name.equals(mAccount.getSpamFolderName()))
{
this.displayName = String.format(getString(R.string.special_mailbox_name_spam_fmt), this.name);
}
this.lastChecked = folder.getLastUpdate();
String mess = truncateStatus(folder.getStatus());

10
src/com/fsck/k9/activity/MessageList.java
View File

@ -2659,6 +2659,16 @@ public class MessageList
{
this.displayName = String.format(getString(R.string.special_mailbox_name_sent_fmt), this.name);
}
if (this.name.equals(account.getArchiveFolderName()))
{
this.displayName = String.format(getString(R.string.special_mailbox_name_archive_fmt), this.name);
}
if (this.name.equals(account.getSpamFolderName()))
{
this.displayName = String.format(getString(R.string.special_mailbox_name_spam_fmt), this.name);
}
}
}

2
src/com/fsck/k9/activity/setup/AccountSetupBasics.java
View File

@ -269,6 +269,8 @@ public class AccountSetupBasics extends K9Activity
mAccount.setTransportUri(outgoingUri.toString());
mAccount.setDraftsFolderName(getString(R.string.special_mailbox_name_drafts));
mAccount.setTrashFolderName(getString(R.string.special_mailbox_name_trash));
mAccount.setArchiveFolderName(getString(R.string.special_mailbox_name_archive));
mAccount.setSpamFolderName(getString(R.string.special_mailbox_name_spam));
mAccount.setOutboxFolderName(getString(R.string.special_mailbox_name_outbox));
mAccount.setSentFolderName(getString(R.string.special_mailbox_name_sent));
AccountSetupCheckSettings.actionCheckSettings(this, mAccount, true, true);

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

@ -30,7 +30,8 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
private static final int SELECT_DRAFT_FOLDER = 100;
private static final int SELECT_SENT_FOLDER = 101;
private static final int SELECT_TRASH_FOLDER = 102;
//private static final int SELECT_OUTBOX_FOLDER = 103;
private static final int SELECT_ARCHIVE_FOLDER = 103;
private static final int SELECT_SPAM_FOLDER = 104;
private static final int popPorts[] =
{
@ -75,6 +76,8 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
private Button mImapFolderDrafts;
private Button mImapFolderSent;
private Button mImapFolderTrash;
private Button mImapFolderArchive;
private Button mImapFolderSpam;
private EditText mImapFolderOutbox;
private EditText mWebdavPathPrefixView;
private EditText mWebdavAuthPathView;
@ -124,6 +127,8 @@ 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);
mImapFolderArchive = (Button)findViewById(R.id.account_imap_folder_archive);
mImapFolderSpam = (Button)findViewById(R.id.account_imap_folder_spam);
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);
@ -143,6 +148,8 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
mImapFolderDrafts.setOnClickListener(this);
mImapFolderSent.setOnClickListener(this);
mImapFolderTrash.setOnClickListener(this);
mImapFolderArchive.setOnClickListener(this);
mImapFolderSpam.setOnClickListener(this);
mNextButton.setOnClickListener(this);
SpinnerOption securityTypes[] =
@ -287,6 +294,8 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
mImapFolderDrafts.setText(mAccount.getDraftsFolderName());
mImapFolderSent.setText(mAccount.getSentFolderName());
mImapFolderTrash.setText(mAccount.getTrashFolderName());
mImapFolderArchive.setText(mAccount.getArchiveFolderName());
mImapFolderSpam.setText(mAccount.getSpamFolderName());
mImapFolderOutbox.setText(mAccount.getOutboxFolderName());
if (uri.getScheme().startsWith("pop3"))
@ -474,6 +483,12 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
case SELECT_TRASH_FOLDER:
mImapFolderTrash.setText(data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER));
return;
case SELECT_ARCHIVE_FOLDER:
mImapFolderArchive.setText(data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER));
return;
case SELECT_SPAM_FOLDER:
mImapFolderSpam.setText(data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER));
return;
}
if (Intent.ACTION_EDIT.equals(getIntent().getAction()))
{
@ -567,6 +582,8 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
mAccount.setDraftsFolderName(mImapFolderDrafts.getText().toString());
mAccount.setSentFolderName(mImapFolderSent.getText().toString());
mAccount.setTrashFolderName(mImapFolderTrash.getText().toString());
mAccount.setArchiveFolderName(mImapFolderArchive.getText().toString());
mAccount.setSpamFolderName(mImapFolderSpam.getText().toString());
mAccount.setOutboxFolderName(mImapFolderOutbox.getText().toString());
mAccount.setCompression(Account.TYPE_MOBILE, compressionMobile.isChecked());
mAccount.setCompression(Account.TYPE_WIFI, compressionWifi.isChecked());
@ -622,6 +639,12 @@ 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_archive:
selectImapFolder(SELECT_ARCHIVE_FOLDER);
break;
case R.id.account_imap_folder_spam:
selectImapFolder(SELECT_SPAM_FOLDER);
break;
}
}
catch (Exception e)
@ -647,6 +670,14 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
curFolder = mImapFolderTrash.getText().toString();
showFolderNone = true;
break;
case SELECT_ARCHIVE_FOLDER:
curFolder = mImapFolderArchive.getText().toString();
showFolderNone = true;
break;
case SELECT_SPAM_FOLDER:
curFolder = mImapFolderSpam.getText().toString();
showFolderNone = true;
break;
default:
throw new IllegalArgumentException(
"Cannot select folder for: " + activityCode);