Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f0f4e9c authored by cketti's avatar cketti
Browse files

Merge pull request #485 from haselwarter 

Conflicts:
	src/com/fsck/k9/preferences/Settings.java
parents 8ef45e8f f5cfacee

res/values/arrays.xml

+30 −0
Original line number Diff line number Diff line
@@ -231,6 +231,22 @@ 
        <item>1000</item>

    </string-array>



    <string-array name="account_settings_folder_notify_new_mail_mode_entries">

        <item>@string/account_settings_folder_notify_new_mail_mode_all</item>

        <item>@string/account_settings_folder_notify_new_mail_mode_first_class</item>

        <item>@string/account_settings_folder_notify_new_mail_mode_first_and_second_class</item>

        <item>@string/account_settings_folder_notify_new_mail_mode_not_second_class</item>

        <item>@string/account_settings_folder_notify_new_mail_mode_none</item>

    </string-array>



    <string-array name="account_settings_folder_notify_new_mail_mode_values" translatable="false">

        <item>ALL</item>

        <item>FIRST_CLASS</item>

        <item>FIRST_AND_SECOND_CLASS</item>

        <item>NOT_SECOND_CLASS</item>

        <item>NONE</item>

    </string-array>



    <string-array name="account_settings_folder_target_mode_entries">

        <item>@string/account_settings_folder_target_mode_all</item>

        <item>@string/account_settings_folder_target_mode_first_class</item>
@@ -285,6 +301,20 @@ 
        <item>INHERITED</item>

    </string-array>



    <string-array name="folder_settings_folder_notify_mode_entries">

        <item>@string/folder_settings_folder_notify_mode_normal</item>

        <item>@string/folder_settings_folder_notify_mode_first_class</item>

        <item>@string/folder_settings_folder_notify_mode_second_class</item>

        <item>@string/folder_settings_folder_notify_mode_inherited</item>

    </string-array>



    <string-array name="folder_settings_folder_notify_mode_values" translatable="false">

        <item>NO_CLASS</item>

        <item>FIRST_CLASS</item>

        <item>SECOND_CLASS</item>

        <item>INHERITED</item>

    </string-array>



    <string-array name="account_setup_delete_policy_entries">

        <item>@string/account_setup_incoming_delete_policy_never_label</item>

        <item>@string/account_setup_incoming_delete_policy_delete_label</item>

res/values/strings.xml

+14 −0
Original line number Diff line number Diff line
@@ -509,6 +509,14 @@ Please submit bug reports, contribute new features and ask questions at 
    <string name="account_settings_default_label">Default account</string>

    <string name="account_settings_default_summary">Send mail from this account by default</string>

    <string name="account_settings_notify_label">New mail notifications</string>



    <string name="account_settings_folder_notify_new_mail_mode_label">Notifications folders</string>

    <string name="account_settings_folder_notify_new_mail_mode_all">All</string>

    <string name="account_settings_folder_notify_new_mail_mode_first_class">Only 1st Class folders</string>

    <string name="account_settings_folder_notify_new_mail_mode_first_and_second_class">1st and 2nd Class folders</string>

    <string name="account_settings_folder_notify_new_mail_mode_not_second_class">All except 2nd Class folders</string>

    <string name="account_settings_folder_notify_new_mail_mode_none">None</string>



    <string name="account_settings_notify_sync_label">Sync notifications</string>

    <string name="account_settings_email_label">Your email address</string>

    <string name="account_settings_notify_summary">Notify in status bar when mail arrives</string>
@@ -658,6 +666,12 @@ Please submit bug reports, contribute new features and ask questions at 
    <string name="folder_settings_folder_push_mode_second_class">2nd Class</string>

    <string name="folder_settings_folder_push_mode_inherited">Same as sync class</string>



    <string name="folder_settings_folder_notify_mode_label">Folder notification class</string>

    <string name="folder_settings_folder_notify_mode_normal">None</string>

    <string name="folder_settings_folder_notify_mode_first_class">1st Class</string>

    <string name="folder_settings_folder_notify_mode_second_class">2nd Class</string>

    <string name="folder_settings_folder_notify_mode_inherited">Same as push class</string>



    <string name="account_settings_incoming_label">Incoming server</string>

    <string name="account_settings_incoming_summary">Configure the incoming mail server</string>

    <string name="account_settings_outgoing_label">Outgoing server</string>

res/xml/account_settings_preferences.xml

+9 −0
Original line number Diff line number Diff line
@@ -343,6 +343,15 @@ 
            android:defaultValue="true"

            android:summary="@string/account_settings_notify_summary" />



        <ListPreference

            android:persistent="false"

            android:key="folder_notify_new_mail_mode"

            android:dependency="account_notify"

            android:title="@string/account_settings_folder_notify_new_mail_mode_label"

            android:entries="@array/account_settings_folder_notify_new_mail_mode_entries"

            android:entryValues="@array/account_settings_folder_notify_new_mail_mode_values"

            android:dialogTitle="@string/account_settings_folder_notify_new_mail_mode_label" />



        <CheckBoxPreference

            android:persistent="false"

            android:key="account_notify_self"

res/xml/folder_settings_preferences.xml

+8 −0
Original line number Diff line number Diff line
@@ -58,6 +58,14 @@ 
            android:entryValues="@array/folder_settings_folder_push_mode_values"

            android:dialogTitle="@string/folder_settings_folder_push_mode_label" />



        <ListPreference

            android:persistent="false"

            android:key="folder_settings_folder_notify_mode"

            android:title="@string/folder_settings_folder_notify_mode_label"

            android:entries="@array/folder_settings_folder_notify_mode_entries"

            android:entryValues="@array/folder_settings_folder_notify_mode_values"

            android:dialogTitle="@string/folder_settings_folder_notify_mode_label" />



        <CheckBoxPreference

            android:persistent="false"

            android:key="folder_settings_include_in_integrated_inbox"

src/com/fsck/k9/Account.java

+17 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ public class Account implements BaseAccount { 
    private long mLastAutomaticCheckTime;

    private long mLatestOldMessageSeenTime;

    private boolean mNotifyNewMail;

    private FolderMode mFolderNotifyNewMailMode;

    private boolean mNotifySelfNewMail;

    private String mInboxFolderName;

    private String mDraftsFolderName;
@@ -274,6 +275,7 @@ public class Account implements BaseAccount { 
        mDisplayCount = K9.DEFAULT_VISIBLE_LIMIT;

        mAccountNumber = -1;

        mNotifyNewMail = true;

        mFolderNotifyNewMailMode = FolderMode.ALL;

        mNotifySync = true;

        mNotifySelfNewMail = true;

        mFolderDisplayMode = FolderMode.NOT_SECOND_CLASS;
@@ -382,6 +384,12 @@ public class Account implements BaseAccount { 
        mLastAutomaticCheckTime = prefs.getLong(mUuid + ".lastAutomaticCheckTime", 0);

        mLatestOldMessageSeenTime = prefs.getLong(mUuid + ".latestOldMessageSeenTime", 0);

        mNotifyNewMail = prefs.getBoolean(mUuid + ".notifyNewMail", false);

        try {

            mFolderNotifyNewMailMode = FolderMode.valueOf(prefs.getString(mUuid  + ".folderNotifyNewMailMode",

                                                 FolderMode.ALL.name()));

        } catch (Exception e) {

            mFolderNotifyNewMailMode = FolderMode.ALL;

        }

        mNotifySelfNewMail = prefs.getBoolean(mUuid + ".notifySelfNewMail", true);

        mNotifySync = prefs.getBoolean(mUuid + ".notifyMailCheck", false);

        mDeletePolicy = prefs.getInt(mUuid + ".deletePolicy", 0);
@@ -703,6 +711,7 @@ public class Account implements BaseAccount { 
        editor.putLong(mUuid + ".lastAutomaticCheckTime", mLastAutomaticCheckTime);

        editor.putLong(mUuid + ".latestOldMessageSeenTime", mLatestOldMessageSeenTime);

        editor.putBoolean(mUuid + ".notifyNewMail", mNotifyNewMail);

        editor.putString(mUuid + ".folderNotifyNewMailMode", mFolderNotifyNewMailMode.name());

        editor.putBoolean(mUuid + ".notifySelfNewMail", mNotifySelfNewMail);

        editor.putBoolean(mUuid + ".notifyMailCheck", mNotifySync);

        editor.putInt(mUuid + ".deletePolicy", mDeletePolicy);
@@ -1057,6 +1066,14 @@ public class Account implements BaseAccount { 
        this.mNotifyNewMail = notifyNewMail;

    }



    public synchronized FolderMode getFolderNotifyNewMailMode() {

        return mFolderNotifyNewMailMode;

    }



    public synchronized void setFolderNotifyNewMailMode(FolderMode folderNotifyNewMailMode) {

        this.mFolderNotifyNewMailMode = folderNotifyNewMailMode;

    }



    public synchronized int getDeletePolicy() {

        return mDeletePolicy;

    }