Projects >> k-9 >>cad83901408f22cefa871fa41ef94dc500da28e4

Chunk
Conflicting content 
    }

    private void onToggleRead(MessageInfoHolder holder) {
<<<<<<< HEAD
        mController.setFlag(holder.message.getFolder().getAccount(), holder.message.getFolder().getRemoteName(), new String[] { holder.uid }, Flag.SEEN, !holder.read);
=======
        LocalMessage message = holder.message;
        Folder folder = message.getFolder();
        Account account = folder.getAccount();
        String folderName = folder.getName();
        mController.setFlag(account, folderName, new Message[] { message }, Flag.SEEN, !holder.read);
>>>>>>> 5591865f17a09f4eaf0d46826d55deeb868eb28d
        holder.read = !holder.read;
        mHandler.sortMessages();
    }
Solution content 
    }

    private void onToggleRead(MessageInfoHolder holder) {
        LocalMessage message = holder.message;
        Folder folder = message.getFolder();
        Account account = folder.getAccount();
        String folderName = folder.getRemoteName();
        mController.setFlag(account, folderName, new Message[] { message }, Flag.SEEN, !holder.read);
        holder.read = !holder.read;
        mHandler.sortMessages();
    }
File
MessageList.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    }

    private void onToggleFlag(MessageInfoHolder holder) {
<<<<<<< HEAD
        mController.setFlag(holder.message.getFolder().getAccount(), holder.message.getFolder().getRemoteName(), new String[] { holder.uid }, Flag.FLAGGED, !holder.flagged);
=======
        LocalMessage message = holder.message;
        Folder folder = message.getFolder();
        Account account = folder.getAccount();
        String folderName = folder.getName();
        mController.setFlag(account, folderName, new Message[] { message }, Flag.FLAGGED, !holder.flagged);
>>>>>>> 5591865f17a09f4eaf0d46826d55deeb868eb28d
        holder.flagged = !holder.flagged;
        mHandler.sortMessages();
    }
Solution content 
    }

    private void onToggleFlag(MessageInfoHolder holder) {
        LocalMessage message = holder.message;
        Folder folder = message.getFolder();
        Account account = folder.getAccount();
        String folderName = folder.getRemoteName();
        mController.setFlag(account, folderName, new Message[] { message }, Flag.FLAGGED, !holder.flagged);
        holder.flagged = !holder.flagged;
        mHandler.sortMessages();
    }
File
MessageList.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    private void onFlag() {
        if (mMessage != null) {
<<<<<<< HEAD
            mController.setFlag(mAccount,
                                mMessage.getFolder().getRemoteName(), new String[] {mMessage.getUid()}, Flag.FLAGGED, !mMessage.isSet(Flag.FLAGGED));
            try {
                mMessage.setFlag(Flag.FLAGGED, !mMessage.isSet(Flag.FLAGGED));
                mMessageView.setHeaders(mMessage, mAccount);
            } catch (MessagingException me) {
                Log.e(K9.LOG_TAG, "Could not set flag on local message", me);
            }
=======
            boolean newState = !mMessage.isSet(Flag.FLAGGED);
            mController.setFlag(mAccount, mMessage.getFolder().getName(),
                    new Message[] { mMessage }, Flag.FLAGGED, newState);
            mMessageView.setHeaders(mMessage, mAccount);
>>>>>>> 5591865f17a09f4eaf0d46826d55deeb868eb28d
        }
    }
Solution content 
    private void onFlag() {
        if (mMessage != null) {
            boolean newState = !mMessage.isSet(Flag.FLAGGED);
            mController.setFlag(mAccount, mMessage.getFolder().getRemoteName(),
                    new Message[] { mMessage }, Flag.FLAGGED, newState);
            mMessageView.setHeaders(mMessage, mAccount);
        }
    }
File
MessageView.java
Developer's decision
Manual
Kind of conflict
Method invocation
Try statement
Variable
Chunk
Conflicting content 
        return super.onPrepareOptionsMenu(menu);
    }

<<<<<<< HEAD
    public void displayMessageBody(final Account account, final String folder, final String uid, final Message message) {
        runOnUiThread(new Runnable() {
            public void run() {
                mTopView.scrollTo(0, 0);
                try {
                    if (MessageView.this.mMessage != null
                            && MessageView.this.mMessage.isSet(Flag.X_DOWNLOADED_PARTIAL)
                    && message.isSet(Flag.X_DOWNLOADED_FULL)) {
                        mMessageView.setHeaders(message, account);
                    }
                    MessageView.this.mMessage = message;
                    mMessageView.displayMessageBody(account, folder, uid, message, mPgpData);
                    mMessageView.renderAttachments(mMessage, 0, mMessage, mAccount, mController, mListener);
                } catch (MessagingException e) {
                    if (Config.LOGV) {
                        Log.v(K9.LOG_TAG, "loadMessageForViewBodyAvailable", e);
                    }
                }
            }
        });
    }

=======
>>>>>>> 5591865f17a09f4eaf0d46826d55deeb868eb28d
    class Listener extends MessagingListener {
        @Override
        public void loadMessageForViewHeadersAvailable(final Account account, String folder, String uid,
Solution content 
        return super.onPrepareOptionsMenu(menu);
    }
    
    class Listener extends MessagingListener {
        @Override
        public void loadMessageForViewHeadersAvailable(final Account account, String folder, String uid,
File
MessageView.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
        if (!mAccount.isSearchByDateCapable()) {
            ((PreferenceScreen) findPreference(PREFERENCE_SCREEN_INCOMING)).removePreference(mMessageAge);
<<<<<<< HEAD
        } else {
=======
       } else {
>>>>>>> 5591865f17a09f4eaf0d46826d55deeb868eb28d
            mMessageAge.setValue(String.valueOf(mAccount.getMaximumPolledMessageAge()));
            mMessageAge.setSummary(mMessageAge.getEntry());
            mMessageAge.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
Solution content 
        if (!mAccount.isSearchByDateCapable()) {
            ((PreferenceScreen) findPreference(PREFERENCE_SCREEN_INCOMING)).removePreference(mMessageAge);
        } else {
            mMessageAge.setValue(String.valueOf(mAccount.getMaximumPolledMessageAge()));
            mMessageAge.setSummary(mMessageAge.getEntry());
            mMessageAge.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
File
AccountSettings.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
            @Override
            public void act(final Account account, final Folder folder,
            final List messages) {
<<<<<<< HEAD
                String[] uids = new String[messages.size()];
                for (int i = 0; i < messages.size(); i++) {
                    uids[i] = messages.get(i).getUid();
                }
                setFlag(account, folder.getRemoteName(), uids, flag, newState);
=======
                setFlag(account, folder.getName(), messages.toArray(EMPTY_MESSAGE_ARRAY), flag,
                        newState);
>>>>>>> 5591865f17a09f4eaf0d46826d55deeb868eb28d
            }

        });
Solution content 
            @Override
            public void act(final Account account, final Folder folder,
            final List messages) {
                setFlag(account, folder.getRemoteName(), messages.toArray(EMPTY_MESSAGE_ARRAY), flag,
                        newState);
            }
        });
File
MessagingController.java
Developer's decision
Manual
Kind of conflict
For statement
Method invocation
Variable
Chunk
Conflicting content 
        }

<<<<<<< HEAD
        public String markupContent(String text, String html) {
            if (text.length() > 0 && html.length() == 0) {
                html = HtmlConverter.textToHtml(text);
            }

            html = HtmlConverter.convertEmoji2Img(html);

            return html;
        }

=======
>>>>>>> 5591865f17a09f4eaf0d46826d55deeb868eb28d
        @Override
        public boolean isInTopGroup() {
            return mInTopGroup;
Solution content 
        }
        
        @Override
        public boolean isInTopGroup() {
            return mInTopGroup;
File
LocalStore.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
        }

        @Override
<<<<<<< HEAD
        public void copyMessages(Message[] messages, Folder folder) throws MessagingException {
            moveOrCopyMessages(messages, folder.getRemoteName(), false);
        }

        @Override
        public void moveMessages(Message[] messages, Folder folder) throws MessagingException {
            moveOrCopyMessages(messages, folder.getRemoteName(), true);
=======
        public Map copyMessages(Message[] messages, Folder folder) throws MessagingException {
            moveOrCopyMessages(messages, folder.getName(), false);
            return null;
        }

        @Override
        public Map moveMessages(Message[] messages, Folder folder) throws MessagingException {
            moveOrCopyMessages(messages, folder.getName(), true);
            return null;
>>>>>>> 5591865f17a09f4eaf0d46826d55deeb868eb28d
        }

        @Override
Solution content 
        }

        @Override
        public Map copyMessages(Message[] messages, Folder folder) throws MessagingException {
            moveOrCopyMessages(messages, folder.getRemoteName(), false);
            return null;
        }

        @Override
        public Map moveMessages(Message[] messages, Folder folder) throws MessagingException {
            moveOrCopyMessages(messages, folder.getRemoteName(), true);
            return null;
        }

        @Override
File
WebDavStore.java
Developer's decision
Combination
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
        }
    }
        this.attachmentCallback = attachmentCallback;
    }

<<<<<<< HEAD
    /**
     * Save a copy of the {@link com.fsck.k9.controller.MessagingController#getListeners()}.  This method will also
     * pass along these listeners to the underlying views.
     * @param listeners Set of listeners.
     */
    public void setListeners(final Set listeners) {
        if (!mScreenReaderEnabled) {
            if (mMessageContentView != null) {
                mMessageContentView.setListeners(listeners);
            }
        } else {
            if (mAccessibleMessageContentView != null) {
                mAccessibleMessageContentView.setListeners(listeners);
=======
    private void moveHeaderToLayout() {
        if (mTitleBarHeaderContainer != null && mTitleBarHeaderContainer.getChildCount() != 0) {
            mTitleBarHeaderContainer.removeView(mHeaderContainer);
            mInsideAttachmentsContainer.addView(mHeaderContainer, 0);

    private void moveHeaderToWebViewTitleBar() {
        if (mTitleBarHeaderContainer != null && mTitleBarHeaderContainer.getChildCount() == 0) {
            mInsideAttachmentsContainer.removeView(mHeaderContainer);
            mTitleBarHeaderContainer.addView(mHeaderContainer);
        }
    }

    @Override
    public Parcelable onSaveInstanceState() {
        Parcelable superState = super.onSaveInstanceState();

        SavedState savedState = new SavedState(superState);

        savedState.attachmentViewVisible = (mAttachmentsContainer != null &&
                mAttachmentsContainer.getVisibility() == View.VISIBLE);
        savedState.hiddenAttachmentsVisible = (mHiddenAttachments != null &&
                mHiddenAttachments.getVisibility() == View.VISIBLE);
        savedState.showPictures = mShowPictures;

        return savedState;
    }

    @Override
    public void onRestoreInstanceState(Parcelable state) {
        if(!(state instanceof SavedState)) {
            super.onRestoreInstanceState(state);
            return;
        }

        SavedState savedState = (SavedState)state;
        super.onRestoreInstanceState(savedState.getSuperState());

        mSavedState = savedState;
    }

    static class SavedState extends BaseSavedState {
        boolean attachmentViewVisible;
        boolean hiddenAttachmentsVisible;
        boolean showPictures;

        @SuppressWarnings("hiding")
        public static final Parcelable.Creator CREATOR =
                new Parcelable.Creator() {
            @Override
            public SavedState createFromParcel(Parcel in) {
                return new SavedState(in);
            }

            @Override
            public SavedState[] newArray(int size) {
                return new SavedState[size];
>>>>>>> 5591865f17a09f4eaf0d46826d55deeb868eb28d
            }
        };
Solution content 
        this.attachmentCallback = attachmentCallback;
    }

    private void moveHeaderToLayout() {
        if (mTitleBarHeaderContainer != null && mTitleBarHeaderContainer.getChildCount() != 0) {
            mTitleBarHeaderContainer.removeView(mHeaderContainer);
            mInsideAttachmentsContainer.addView(mHeaderContainer, 0);
        }
    }

    private void moveHeaderToWebViewTitleBar() {
        if (mTitleBarHeaderContainer != null && mTitleBarHeaderContainer.getChildCount() == 0) {
            mInsideAttachmentsContainer.removeView(mHeaderContainer);
            mTitleBarHeaderContainer.addView(mHeaderContainer);
        }
    }

    @Override
    public Parcelable onSaveInstanceState() {
        Parcelable superState = super.onSaveInstanceState();

        SavedState savedState = new SavedState(superState);

        savedState.attachmentViewVisible = (mAttachmentsContainer != null &&
                mAttachmentsContainer.getVisibility() == View.VISIBLE);
        savedState.hiddenAttachmentsVisible = (mHiddenAttachments != null &&
                mHiddenAttachments.getVisibility() == View.VISIBLE);
        savedState.showPictures = mShowPictures;

        return savedState;
    }

    @Override
    public void onRestoreInstanceState(Parcelable state) {
        if(!(state instanceof SavedState)) {
            super.onRestoreInstanceState(state);
            return;
        }

        SavedState savedState = (SavedState)state;
        super.onRestoreInstanceState(savedState.getSuperState());

        mSavedState = savedState;
    }

    static class SavedState extends BaseSavedState {
        boolean attachmentViewVisible;
        boolean hiddenAttachmentsVisible;
        boolean showPictures;

        @SuppressWarnings("hiding")
        public static final Parcelable.Creator CREATOR =
                new Parcelable.Creator() {
            @Override
            public SavedState createFromParcel(Parcel in) {
                return new SavedState(in);
            }

            @Override
            public SavedState[] newArray(int size) {
                return new SavedState[size];
            }
        };
File
SingleMessageView.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Class signature
Comment
If statement
Method declaration
Method invocation
Method signature