mirror of https://github.com/moparisthebest/k-9
Added account settings for "archive" and "spam" folders. See issue 3.
This commit is contained in:
Thialfihar
parent
5c3f366661
commit
03b28c8b68
|
|
@ -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>
|
||||
|
|
@ -202,12 +212,12 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
<CheckBox
|
||||
android:id="@+id/compression_mobile"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/account_setup_incoming_mobile_label"
|
||||
/>
|
||||
<CheckBox
|
||||
android:id="@+id/compression_mobile"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/account_setup_incoming_mobile_label"
|
||||
/>
|
||||
<CheckBox
|
||||
android:id="@+id/compression_wifi"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -227,10 +237,10 @@
|
|||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
<CheckBox
|
||||
android:id="@+id/save_all_headers"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/account_setup_incoming_save_all_headers_label" />
|
||||
android:id="@+id/save_all_headers"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/account_setup_incoming_save_all_headers_label" />
|
||||
<LinearLayout
|
||||
android:id="@+id/push_poll_on_connect_section"
|
||||
android:layout_width="fill_parent"
|
||||
|
|
@ -242,12 +252,12 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
<CheckBox
|
||||
android:id="@+id/push_poll_on_connect"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:label="foo"
|
||||
/>
|
||||
<CheckBox
|
||||
android:id="@+id/push_poll_on_connect"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:label="foo"
|
||||
/>
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:id="@+id/idle_refresh_period_label"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -132,7 +133,7 @@
|
|||
<xliff:g id="oldSize">%s</xliff:g>
|
||||
auf
|
||||
<xliff:g id="newSize">%s</xliff:g>
|
||||
komprimiert
|
||||
komprimiert
|
||||
</string>
|
||||
|
||||
<string name="compacting_account">Komprimiere Konto \"<xliff:g id="account">%s</xliff:g>\"</string>
|
||||
|
|
@ -157,20 +158,24 @@
|
|||
<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>
|
||||
<string name="send_failure_body_fmt">K-9 hat beim Senden einiger Ihrer Nachrichten ein Problem festgestellt.
|
||||
Hierbei kann K-9 aber nicht feststellen, ob die Nachricht gesendet wurde oder nicht. Die Empfänger haben möglicherweise schon Kopien der Nachricht erhalten.
|
||||
\u000a\u000aDie Nachrichten, bei denen dieses Problem auftrat, sind in ihrem Postausgang markiert. Wenn Sie die Markierung entfernen, wird K-9 versuchen die Nachricht erneut zu versenden.
|
||||
Durch langes Drücken auf den Postausgang erscheint ein Menü, bei dem mit "Nachricht senden" ein erneuter Sendeversuch gestartet werden kann.\u000A\u000a
|
||||
Der Ordner <xliff:g id="errorFolder">%s</xliff:g> enthält möglicherweise Fehlermeldungen mit Details zu diesem Problem.</string>
|
||||
Durch langes Drücken auf den Postausgang erscheint ein Menü, bei dem mit "Nachricht senden" ein erneuter Sendeversuch gestartet werden kann.\u000A\u000a
|
||||
Der Ordner <xliff:g id="errorFolder">%s</xliff:g> enthält möglicherweise Fehlermeldungen mit Details zu diesem Problem.</string>
|
||||
|
||||
<string name="alert_header">K-9-Alarm</string>
|
||||
<string name="no_connection_alert">Synchronisierung und Senden von Nachrichten aufgrund von fehlender Netzwerkverbindung eingestellt.</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>
|
||||
|
|
@ -375,7 +385,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
|
|||
<string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP vor SMTP</string>
|
||||
<string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV(Exchange) vor SMTP</string>
|
||||
|
||||
<string name="account_setup_bad_uri">Ungültige Einstellung: <xliff:g id="err_mess">%s</xliff:g></string>
|
||||
<string name="account_setup_bad_uri">Ungültige Einstellung: <xliff:g id="err_mess">%s</xliff:g></string>
|
||||
|
||||
<string name="account_setup_options_title">Kontoeinstellungen</string>
|
||||
|
||||
|
|
@ -442,10 +452,10 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
|
|||
<string name="account_settings_hide_buttons_always">Immer</string>
|
||||
|
||||
<string name="account_settings_composition">Nachricht verfassen</string>
|
||||
<string name="account_settings_sync">Ordner synchronisieren</string>
|
||||
<string name="account_settings_sync">Ordner synchronisieren</string>
|
||||
<string name="account_settings_folders">Ordner</string>
|
||||
<string name="account_settings_message_lists">Liste der Nachrichten</string>
|
||||
<string name="account_settings_message_view">Anzeige der Nachricht</string>
|
||||
<string name="account_settings_message_lists">Liste der Nachrichten</string>
|
||||
<string name="account_settings_message_view">Anzeige der Nachricht</string>
|
||||
|
||||
<string name="account_settings_mail_check_frequency_label">Häufigkeit der E-Mail-Abfrage</string>
|
||||
<string name="account_settings_second_class_check_frequency_label">Häufigkeit der Abfrage für Nebenordner</string>
|
||||
|
|
@ -529,16 +539,16 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
|
|||
<string name="manage_identities_context_menu_title">Identität berarbeiten</string>
|
||||
|
||||
<string name="edit_identity_title">Identität bearbeiten</string>
|
||||
<string name="new_identity_action">Neue Identität erstellen</string>
|
||||
<string name="new_identity_action">Neue Identität erstellen</string>
|
||||
|
||||
<string name="account_settings_always_bcc_label">Alle Nachrichten mit BCC an</string>
|
||||
<string name="account_settings_always_bcc_summary">Dieser Adresse eine Kopie aller ausgehenden Nachrichten zustellen</string>
|
||||
|
||||
<string name="manage_identities_edit_action">Bearbeiten</string>
|
||||
<string name="manage_identities_move_up_action">Nach oben verschieben</string>
|
||||
<string name="manage_identities_move_down_action">Nach unten verschieben</string>
|
||||
<string name="manage_identities_move_top_action">Ganz nach oben / Standard</string>
|
||||
<string name="manage_identities_remove_action">Entfernen</string>
|
||||
<string name="manage_identities_edit_action">Bearbeiten</string>
|
||||
<string name="manage_identities_move_up_action">Nach oben verschieben</string>
|
||||
<string name="manage_identities_move_down_action">Nach unten verschieben</string>
|
||||
<string name="manage_identities_move_top_action">Ganz nach oben / Standard</string>
|
||||
<string name="manage_identities_remove_action">Entfernen</string>
|
||||
|
||||
<string name="edit_identity_description_label">Name der Identität</string>
|
||||
<string name="edit_identity_description_hint">(Optional)</string>
|
||||
|
|
@ -601,7 +611,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
|
|||
|
||||
<string name="message_help_key">Del (or D) - Löschen\u000AR -
|
||||
Antworten\u000AA - Allen antworten\u000AF - Weiterleiten\u000AJ or P - Vorherige
|
||||
Nachricht\u000AK, N - Nächste Nachricht\u000AM - Verschieben\u000AY - Kopieren\u000AZ - Heraus-Zoomen\u000AShift-Z -
|
||||
Nachricht\u000AK, N - Nächste Nachricht\u000AM - Verschieben\u000AY - Kopieren\u000AZ - Heraus-Zoomen\u000AShift-Z -
|
||||
Hinein-Zoomen\u000aG - Markieren</string>
|
||||
<string name="message_list_help_key">Del (or D) - Löschen\u000AR -
|
||||
Antworten\u000AA - Allen Antworten\u000AC - Verfassen\u000AF - Weiterleiten\u000aM - Verschieben\u000AY - Kopieren\u000AG - Markieren\u000AO - Sortierung\u000AI - Sortierungsreihenfolge\u000AQ
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
<string name="read_attachment_desc">Allows this application to read your Email attachments.</string>
|
||||
|
||||
<string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
|
||||
<string name="accounts_title">Accounts</string>
|
||||
<string name="advanced">Advanced</string>
|
||||
<string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
|
||||
<string name="accounts_title">Accounts</string>
|
||||
<string name="advanced">Advanced</string>
|
||||
<string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
|
||||
|
||||
<string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
|
||||
<string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
|
||||
|
||||
<string name="compose_title">Compose</string>
|
||||
<string name="debug_title">Debug</string>
|
||||
|
|
@ -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>
|
||||
|
|
@ -265,8 +269,8 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
|
|||
|
||||
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
|
||||
<string name="message_additional_headers_not_downloaded">Not all headers have been downloaded or saved. Select \"Save all headers locally\" in the account\'s incoming server settings to enable this for the future.</string>
|
||||
<string name="message_no_additional_headers_available">All headers have been downloaded, but there are no additional headers to show.</string>
|
||||
<string name="message_additional_headers_retrieval_failed">The retrieval of additional headers from the database or mail server failed.</string>
|
||||
<string name="message_no_additional_headers_available">All headers have been downloaded, but there are no additional headers to show.</string>
|
||||
<string name="message_additional_headers_retrieval_failed">The retrieval of additional headers from the database or mail server failed.</string>
|
||||
|
||||
<string name="mailbox_select_dlg_title">Folders</string>
|
||||
<string name="mailbox_select_dlg_new_mailbox_action">New folder</string>
|
||||
|
|
@ -285,8 +289,8 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
|
|||
<string name="message_saved_toast">Message saved as draft</string>
|
||||
<string name="message_delete_failed">Message could not be deleted</string>
|
||||
|
||||
<string name="about_header">About <xliff:g id="app_name">%s</xliff:g></string>
|
||||
<string name="about_version">Version: <xliff:g id="version">%s</xliff:g></string>
|
||||
<string name="about_header">About <xliff:g id="app_name">%s</xliff:g></string>
|
||||
<string name="about_version">Version: <xliff:g id="version">%s</xliff:g></string>
|
||||
|
||||
|
||||
<string name="global_settings_flag_label">Message stars</string>
|
||||
|
|
@ -301,7 +305,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
|
|||
<string name="global_settings_messageview_return_to_list_label">Return to list after delete</string>
|
||||
<string name="global_settings_messageview_return_to_list_summary">Return to message list after message deletion</string>
|
||||
|
||||
<string name="account_setup_basics_title">Set up a new account</string>
|
||||
<string name="account_setup_basics_title">Set up a new account</string>
|
||||
<string name="account_setup_basics_instructions">Enter this account\'s email address:</string>
|
||||
<string name="account_setup_basics_instructions2_fmt">(You may add <xliff:g id="number_accounts">%d</xliff:g> more accounts.)</string>
|
||||
<string name="account_setup_basics_email_hint">Email address</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>
|
||||
|
|
@ -404,7 +410,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
|
|||
<string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP before SMTP</string>
|
||||
<string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) before SMTP</string>
|
||||
|
||||
<string name="account_setup_bad_uri">Invalid setup: <xliff:g id="err_mess">%s</xliff:g></string>
|
||||
<string name="account_setup_bad_uri">Invalid setup: <xliff:g id="err_mess">%s</xliff:g></string>
|
||||
|
||||
<string name="account_setup_options_title">Account options</string>
|
||||
|
||||
|
|
@ -480,17 +486,16 @@ 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>
|
||||
<string name="account_settings_hide_buttons_always">Always</string>
|
||||
|
||||
<string name="account_settings_composition">Writing messages</string>
|
||||
<string name="account_settings_sync">Syncing folders</string>
|
||||
<string name="account_settings_sync">Syncing folders</string>
|
||||
<string name="account_settings_folders">Folders</string>
|
||||
<string name="account_settings_message_lists">Listing messages</string>
|
||||
<string name="account_settings_message_view">Viewing messages</string>
|
||||
<string name="account_settings_message_lists">Listing messages</string>
|
||||
<string name="account_settings_message_view">Viewing messages</string>
|
||||
<string name="account_settings_quote_prefix_label">Quote prefix</string>
|
||||
|
||||
<string name="account_settings_mail_check_frequency_label">Folder poll check frequency</string>
|
||||
|
|
@ -604,16 +609,16 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
|
|||
<string name="manage_identities_context_menu_title">Manage identity</string>
|
||||
|
||||
<string name="edit_identity_title">Edit identity</string>
|
||||
<string name="new_identity_action">New identity</string>
|
||||
<string name="new_identity_action">New identity</string>
|
||||
|
||||
<string name="account_settings_always_bcc_label">Bcc all messages to</string>
|
||||
<string name="account_settings_always_bcc_summary">Send this address a copy of every outgoing message</string>
|
||||
|
||||
<string name="manage_identities_edit_action">Edit</string>
|
||||
<string name="manage_identities_move_up_action">Move up</string>
|
||||
<string name="manage_identities_move_down_action">Move down</string>
|
||||
<string name="manage_identities_move_top_action">Move to top / make default</string>
|
||||
<string name="manage_identities_remove_action">Remove</string>
|
||||
<string name="manage_identities_edit_action">Edit</string>
|
||||
<string name="manage_identities_move_up_action">Move up</string>
|
||||
<string name="manage_identities_move_down_action">Move down</string>
|
||||
<string name="manage_identities_move_top_action">Move to top / make default</string>
|
||||
<string name="manage_identities_remove_action">Remove</string>
|
||||
|
||||
<string name="edit_identity_description_label">Identity description</string>
|
||||
<string name="edit_identity_description_hint">(Optional)</string>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -194,10 +196,10 @@ public class Account implements BaseAccount
|
|||
mPushPollOnConnect = preferences.getPreferences().getBoolean(mUuid
|
||||
+ ".pushPollOnConnect", true);
|
||||
mDisplayCount = preferences.getPreferences().getInt(mUuid + ".displayCount", K9.DEFAULT_VISIBLE_LIMIT);
|
||||
if (mDisplayCount < 0)
|
||||
{
|
||||
mDisplayCount = K9.DEFAULT_VISIBLE_LIMIT;
|
||||
}
|
||||
if (mDisplayCount < 0)
|
||||
{
|
||||
mDisplayCount = K9.DEFAULT_VISIBLE_LIMIT;
|
||||
}
|
||||
mLastAutomaticCheckTime = preferences.getPreferences().getLong(mUuid
|
||||
+ ".lastAutomaticCheckTime", 0);
|
||||
mNotifyNewMail = preferences.getPreferences().getBoolean(mUuid + ".notifyNewMail",
|
||||
|
|
@ -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);
|
||||
|
|
@ -532,10 +542,12 @@ public class Account implements BaseAccount
|
|||
//folder.refresh(prefs);
|
||||
Folder.FolderClass fMode = localFolder.getDisplayClass(prefs);
|
||||
|
||||
// Always get stats about the INBOX (see issue 1817)
|
||||
// Always get stats about the INBOX (see issue 1817)
|
||||
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;
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue