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

Commit f363333c authored by Jesse Vincent's avatar Jesse Vincent
Browse files

simplify the messagelist chips based on lots of user screaming. default checkboxes to being on.

parent 175e29b7

src/com/fsck/k9/Account.java

+12 −12
Original line number Diff line number Diff line
@@ -874,24 +874,24 @@ public class Account implements BaseAccount { 
        if (messageRead) {

            if (messageFlagged) {

                chip = mFlaggedReadColorChip;

            } else if (toMe) {

                chip = mToMeReadColorChip;

            } else if (ccMe) {

                chip = mCcMeReadColorChip;

            } else if (fromMe) {

                chip = mFromMeReadColorChip;

          //  } else if (toMe) {

          //      chip = mToMeReadColorChip;

          //  } else if (ccMe) {

          //      chip = mCcMeReadColorChip;

          //  } else if (fromMe) {

          //      chip = mFromMeReadColorChip;

            } else {

                chip = mReadColorChip;

            }

        } else {

            if (messageFlagged) {

                chip = mFlaggedUnreadColorChip;

            } else if (toMe) {

                chip = mToMeUnreadColorChip;

            } else if (ccMe) {

                chip = mCcMeUnreadColorChip;

            } else if (fromMe) {

                chip = mFromMeUnreadColorChip;

          //  } else if (toMe) {

          //      chip = mToMeUnreadColorChip;

          //  } else if (ccMe) {

          //      chip = mCcMeUnreadColorChip;

          //  } else if (fromMe) {

          //      chip = mFromMeUnreadColorChip;

            } else {

                chip = mUnreadColorChip;

            }

src/com/fsck/k9/K9.java

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ public class K9 extends Application { 
        WHEN_IN_LANDSCAPE

    }



    private static boolean mMessageListCheckboxes = false;

    private static boolean mMessageListCheckboxes = true;

    private static int mMessageListPreviewLines = 2;



    private static boolean mShowCorrespondentNames = true;
@@ -680,7 +680,7 @@ public class K9 extends Application { 
        mCountSearchMessages = sprefs.getBoolean("countSearchMessages", true);

        mHideSpecialAccounts = sprefs.getBoolean("hideSpecialAccounts", false);

        mMessageListSenderAboveSubject = sprefs.getBoolean("messageListSenderAboveSubject", false);

        mMessageListCheckboxes = sprefs.getBoolean("messageListCheckboxes", false);

        mMessageListCheckboxes = sprefs.getBoolean("messageListCheckboxes", true);

        mMessageListPreviewLines = sprefs.getInt("messageListPreviewLines", 2);



        mMobileOptimizedLayout = sprefs.getBoolean("mobileOptimizedLayout", false);

src/com/fsck/k9/preferences/GlobalSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public class GlobalSettings { 
                new V(1, new BooleanSetting(true))

            ));

        s.put("messageListCheckboxes", Settings.versions(

                new V(1, new BooleanSetting(false))

                new V(1, new BooleanSetting(true))

            ));

        s.put("messageListPreviewLines", Settings.versions(

                new V(1, new IntegerRangeSetting(1, 100, 2))