Projects >> k-9 >>5b772ef1717c46caaff2ed2daf08f55e2644108e

Chunk
Conflicting content 
    private static String mQuietTimeEnds = null;
    private static boolean compactLayouts = false;
    private static String mAttachmentDefaultPath = "";
<<<<<<< HEAD
    private static boolean mShowAdvancedOptions;

=======

    private static boolean mBatchButtonsMarkRead = true;
    private static boolean mBatchButtonsDelete = true;
    private static boolean mBatchButtonsArchive = false;
    private static boolean mBatchButtonsMove = false;
    private static boolean mBatchButtonsFlag = true;
    private static boolean mBatchButtonsUnselect = true;
    
>>>>>>> 029c8958a37768f372dd7afd93f74220363cb025
    private static boolean useGalleryBugWorkaround = false;
    private static boolean galleryBuggy;
Solution content 
    private static String mQuietTimeEnds = null;
    private static boolean compactLayouts = false;
    private static String mAttachmentDefaultPath = "";

    private static boolean mBatchButtonsMarkRead = true;
    private static boolean mBatchButtonsDelete = true;
    private static boolean mBatchButtonsArchive = false;
    private static boolean mBatchButtonsMove = false;
    private static boolean mBatchButtonsFlag = true;
    private static boolean mBatchButtonsUnselect = true;
    private static boolean mShowAdvancedOptions;
    
    private static boolean useGalleryBugWorkaround = false;
    private static boolean galleryBuggy;
File
K9.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
        mDelete.setEnabled(true);
        mNext.setEnabled(mNextMessage != null);
        mPrevious.setEnabled(mPreviousMessage != null);
<<<<<<< HEAD
        // Only enable the button if the Archive folder is not the current folder and not NONE.
        mArchive.setEnabled(!mMessageReference.folderName.equals(mAccount.getArchiveFolderName()) &&
                !K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getArchiveFolderName()));
        // Only enable the button if the Spam folder is not the current folder and not NONE.
        mSpam.setEnabled(!mMessageReference.folderName.equals(mAccount.getSpamFolderName()) &&
                !K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getSpamFolderName()));
        mMove.setEnabled(true);
=======
        // If moving isn't support at all, then all of them must be disabled anyway.
        if (mController.isMoveCapable(mAccount)) {
            // Only enable the button if they have an archive folder and it's not the current folder.
            mArchive.setEnabled(!mMessageReference.folderName.equals(mAccount.getArchiveFolderName()) &&
                                mAccount.hasArchiveFolder());
            // Only enable the button if the Spam folder is not the current folder and not NONE.
            mSpam.setEnabled(!mMessageReference.folderName.equals(mAccount.getSpamFolderName()) &&
                             !K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getSpamFolderName()));
            mMove.setEnabled(true);
        } else {
            disableMoveButtons();
        }
>>>>>>> 029c8958a37768f372dd7afd93f74220363cb025
    }

    private void disableButtons() {
Solution content 
        mDelete.setEnabled(true);
        mNext.setEnabled(mNextMessage != null);
        mPrevious.setEnabled(mPreviousMessage != null);
        // If moving isn't support at all, then all of them must be disabled anyway.
        if (mController.isMoveCapable(mAccount)) {
            // Only enable the button if they have an archive folder and it's not the current folder.
            mArchive.setEnabled(!mMessageReference.folderName.equals(mAccount.getArchiveFolderName()) &&
                    !K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getArchiveFolderName()));
            // Only enable the button if the Spam folder is not the current folder and not NONE.
            mSpam.setEnabled(!mMessageReference.folderName.equals(mAccount.getSpamFolderName()) &&
                    !K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getSpamFolderName()));
            mMove.setEnabled(true);
        } else {
            disableMoveButtons();
        }
    }

    private void disableButtons() {
File
MessageView.java
Developer's decision
Combination
Kind of conflict
Comment
If statement
Method invocation
Chunk
Conflicting content 
    public boolean onCreateOptionsMenu(Menu menu) {
        super.onCreateOptionsMenu(menu);
        getMenuInflater().inflate(R.menu.message_view_option, menu);
<<<<<<< HEAD
        if (K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getArchiveFolderName())) {
=======
        if (!mController.isCopyCapable(mAccount)) {
            menu.findItem(R.id.copy).setVisible(false);
        }
        if (!mController.isMoveCapable(mAccount)) {
            menu.findItem(R.id.move).setVisible(false);
            menu.findItem(R.id.archive).setVisible(false);
            menu.findItem(R.id.spam).setVisible(false);
        }
        if (!mAccount.hasArchiveFolder()) {
>>>>>>> 029c8958a37768f372dd7afd93f74220363cb025
            menu.findItem(R.id.archive).setVisible(false);
        }
        if (K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getSpamFolderName())) {
Solution content 
    public boolean onCreateOptionsMenu(Menu menu) {
        super.onCreateOptionsMenu(menu);
        getMenuInflater().inflate(R.menu.message_view_option, menu);
        if (!mController.isCopyCapable(mAccount)) {
            menu.findItem(R.id.copy).setVisible(false);
        }
        if (!mController.isMoveCapable(mAccount)) {
            menu.findItem(R.id.move).setVisible(false);
            menu.findItem(R.id.archive).setVisible(false);
            menu.findItem(R.id.spam).setVisible(false);
        }
        if (K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getArchiveFolderName())) {
            menu.findItem(R.id.archive).setVisible(false);
        }
        if (K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getSpamFolderName())) {
File
MessageView.java
Developer's decision
Combination
Kind of conflict
If statement