Projects >> k-9 >>4f8fc5bc5b6b33537c53ddf89b57ba865c716460

Chunk
Conflicting content 
    public abstract void setReferences(String references) throws MessagingException;

<<<<<<< HEAD:k9mail-library/src/main/java/com/fsck/k9/mail/Message.java
    public abstract Set getHeaderNames() throws MessagingException;
=======
    @Override
    public abstract Body getBody();

    @Override
    public abstract String getContentType() throws MessagingException;

    @Override
    public abstract void addHeader(String name, String value) throws MessagingException;

    @Override
    public abstract void addRawHeader(String name, String raw) throws MessagingException;

    @Override
    public abstract void setHeader(String name, String value) throws MessagingException;

    @Override
    public abstract String[] getHeader(String name) throws MessagingException;

    public abstract Set getHeaderNames() throws UnavailableStorageException;

    @Override
    public abstract void removeHeader(String name) throws MessagingException;

    @Override
    public abstract void setBody(Body body) throws MessagingException;
>>>>>>> f89b0548a6f2b1554f5adcc6b36b414afdb63a01:src/com/fsck/k9/mail/Message.java

    public abstract long getId();
Solution content 
    public abstract void setReferences(String references) throws MessagingException;

    @Override
    public abstract Body getBody();

    @Override
    public abstract String getContentType() throws MessagingException;

    @Override
    public abstract void addHeader(String name, String value) throws MessagingException;

    @Override
    public abstract void addRawHeader(String name, String raw) throws MessagingException;

    @Override
    public abstract void setHeader(String name, String value) throws MessagingException;

    @Override
    public abstract String[] getHeader(String name) throws MessagingException;

    public abstract Set getHeaderNames() throws MessagingException;

    @Override
    public abstract void removeHeader(String name) throws MessagingException;

    @Override
    public abstract void setBody(Body body) throws MessagingException;

    public abstract long getId();
File
Message.java
Developer's decision
Combination
Kind of conflict
Annotation
Method interface
Chunk
Conflicting content 
            }
    public void writeTo(OutputStream out) throws IOException {
        BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out), 1024);
        for (Field field : mFields) {
<<<<<<< HEAD:k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeHeader.java
            if (!Arrays.asList(writeOmitFields).contains(field.name)) {
                String v = field.value;

                if (hasToBeEncoded(v)) {
                    Charset charset = null;

                    if (mCharset != null) {
                        charset = Charset.forName(mCharset);
                    }
                    v = EncoderUtil.encodeEncodedWord(field.value, charset);
=======
            if (!Utility.arrayContains(writeOmitFields, field.getName())) {
                if (field.hasRawData()) {
                    writer.write(field.getRaw());
                } else {
                    writeNameValueField(writer, field);
>>>>>>> f89b0548a6f2b1554f5adcc6b36b414afdb63a01:src/com/fsck/k9/mail/internet/MimeHeader.java
                }
                writer.write("\r\n");
Solution content 
    public void writeTo(OutputStream out) throws IOException {
        BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out), 1024);
        for (Field field : mFields) {
            if (!Arrays.asList(writeOmitFields).contains(field.name)) {
                if (field.hasRawData()) {
                    writer.write(field.getRaw());
                } else {
                    writeNameValueField(writer, field);
                }
                writer.write("\r\n");
            }
File
MimeHeader.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
    }

    @Override
<<<<<<< HEAD:k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeMessage.java
    public void setHeader(String name, String value) throws MessagingException {
=======
    public void addRawHeader(String name, String raw) {
        mHeader.addRawHeader(name, raw);
    }

    @Override
    public void setHeader(String name, String value) throws UnavailableStorageException {
>>>>>>> f89b0548a6f2b1554f5adcc6b36b414afdb63a01:src/com/fsck/k9/mail/internet/MimeMessage.java
        mHeader.setHeader(name, value);
    }
Solution content 
    }

    @Override
    public void addRawHeader(String name, String raw) {
        mHeader.addRawHeader(name, raw);
    }

    @Override
    public void setHeader(String name, String value) throws MessagingException {
        mHeader.setHeader(name, value);
    }
File
MimeMessage.java
Developer's decision
Combination
Kind of conflict
Annotation
Method declaration
Method signature
Chunk
Conflicting content 
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;

<<<<<<< HEAD:k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java
=======
import com.fsck.k9.mail.internet.MimeMessageHelper;
import javax.net.ssl.SSLException;

import org.apache.commons.io.IOUtils;

import android.content.Context;
>>>>>>> f89b0548a6f2b1554f5adcc6b36b414afdb63a01:src/com/fsck/k9/mail/store/ImapStore.java
import android.net.ConnectivityManager;
import android.os.PowerManager;
import android.text.TextUtils;
Solution content 
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;

import android.net.ConnectivityManager;
import android.os.PowerManager;
import android.text.TextUtils;
File
ImapStore.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
<<<<<<< HEAD:k9mail/src/androidTest/java/com/fsck/k9/mail/MessageTest.java
import java.util.Date;
import java.util.TimeZone;

=======

import com.fsck.k9.mail.internet.MimeMessageHelper;
>>>>>>> f89b0548a6f2b1554f5adcc6b36b414afdb63a01:tests/src/com/fsck/k9/mail/MessageTest.java
import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.codec.Base64InputStream;
import org.apache.james.mime4j.util.MimeUtil;
Solution content 
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Date;
import java.util.TimeZone;

import com.fsck.k9.mail.internet.MimeMessageHelper;
import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.codec.Base64InputStream;
import org.apache.james.mime4j.util.MimeUtil;
File
MessageTest.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
                                    // triggering T_MIME_NO_TEXT and T_TVD_MIME_NO_HEADERS
                                    // SpamAssassin rules.
                                    localMessage.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "text/plain");
<<<<<<< HEAD:k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java
                                    localMessage.setBody(new TextBody(""));
                                } else if (mp.getCount() == 1 &&
                                        !(mp.getBodyPart(0) instanceof LocalAttachmentBodyPart))
=======
                                    MimeMessageHelper.setBody(localMessage, new TextBody(""));
                                } else if (mp.getCount() == 1 && (mp.getBodyPart(0) instanceof LocalAttachmentBodyPart) == false)

>>>>>>> f89b0548a6f2b1554f5adcc6b36b414afdb63a01:src/com/fsck/k9/mail/store/local/LocalFolder.java
                                {
                                    // If we have only one part, drop the MimeMultipart container.
                                    BodyPart part = mp.getBodyPart(0);
Solution content 
                                    // triggering T_MIME_NO_TEXT and T_TVD_MIME_NO_HEADERS
                                    // SpamAssassin rules.
                                    localMessage.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "text/plain");
                                    MimeMessageHelper.setBody(localMessage, new TextBody(""));
                                } else if (mp.getCount() == 1 &&
                                        !(mp.getBodyPart(0) instanceof LocalAttachmentBodyPart)) {
                                    // If we have only one part, drop the MimeMultipart container.
                                    BodyPart part = mp.getBodyPart(0);
File
LocalFolder.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
=======
                                             getAccount(),
                                             attachmentId);
                            if (MimeUtil.isMessage(attachment.getMimeType())) {
<<<<<<< HEAD:k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java
                                attachment.setBody(new LocalAttachmentMessageBody(
                                        contentUri, LocalFolder.this.localStore.context));
                            } else {
                                attachment.setBody(new LocalAttachmentBody(
                                        contentUri, LocalFolder.this.localStore.context));
                                LocalAttachmentMessageBody body = new LocalAttachmentMessageBody(
                                        contentUri, LocalFolder.this.localStore.mApplication);
                                MimeMessageHelper.setBody(attachment, body);
                            } else {
                                LocalAttachmentBody body = new LocalAttachmentBody(
                                        contentUri, LocalFolder.this.localStore.mApplication);
                                MimeMessageHelper.setBody(attachment, body);
>>>>>>> f89b0548a6f2b1554f5adcc6b36b414afdb63a01:src/com/fsck/k9/mail/store/local/LocalFolder.java
                            }
                            ContentValues cv = new ContentValues();
                            cv.put("content_uri", contentUri != null ? contentUri.toString() : null);
Solution content 
                                             getAccount(),
                                             attachmentId);
                            if (MimeUtil.isMessage(attachment.getMimeType())) {
                                LocalAttachmentMessageBody body = new LocalAttachmentMessageBody(
                                        contentUri, LocalFolder.this.localStore.context);
                                MimeMessageHelper.setBody(attachment, body);
                            } else {
                                LocalAttachmentBody body = new LocalAttachmentBody(
                                        contentUri, LocalFolder.this.localStore.context);
                                MimeMessageHelper.setBody(attachment, body);
                            }
                            ContentValues cv = new ContentValues();
                            cv.put("content_uri", contentUri != null ? contentUri.toString() : null);
File
LocalFolder.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    }

    @Override
<<<<<<< HEAD:k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessage.java
    public void setHeader(String name, String value) throws MessagingException {
=======
    public void addRawHeader(String name, String raw) {
        throw new RuntimeException("Not supported");
    }

    @Override
    public void setHeader(String name, String value) throws UnavailableStorageException {
>>>>>>> f89b0548a6f2b1554f5adcc6b36b414afdb63a01:src/com/fsck/k9/mail/store/local/LocalMessage.java
        if (!mHeadersLoaded)
            loadHeaders();
        super.setHeader(name, value);
Solution content 
    }

    @Override
    public void addRawHeader(String name, String raw) {
        throw new RuntimeException("Not supported");
    }

    @Override
    public void setHeader(String name, String value) throws MessagingException {
        if (!mHeadersLoaded)
            loadHeaders();
        super.setHeader(name, value);
File
LocalMessage.java
Developer's decision
Combination
Kind of conflict
Annotation
Method declaration
Method signature
Chunk
Conflicting content 
        BinaryTempFileBody.setTempDirectory(new File(System.getProperty("java.io.tmpdir")));
    }

<<<<<<< HEAD:tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java
    @Test public void testSinglePart7BitNoRecurse() throws Exception {
=======
    private static ByteArrayInputStream toStream(String rawMailData) throws Exception {
        return new ByteArrayInputStream(rawMailData.getBytes("ISO-8859-1"));
    }

    private static MimeMessage parseWithoutRecurse(InputStream data) throws Exception {
        return new MimeMessage(data, false);
    }

    private static MimeMessage parseWithRecurse(InputStream data) throws Exception {
        return new MimeMessage(data, true);
    }

    private static void checkAddresses(Address[] actual, String... expected) {
        for (int i = 0; i < actual.length; i++) {
            assertEquals(actual[i].toEncodedString(), expected[i]);
        }
        assertEquals(expected.length, actual.length);
    }

    private static String streamToString(InputStream stream) throws Exception {
        return IOUtils.toString(stream, "ISO-8859-1");
    }

    private static List getLeafParts(Body body) {
        if (body instanceof Multipart) {
            List ret = new ArrayList();
            for (BodyPart child : ((Multipart) body).getBodyParts()) {
                ret.addAll(getLeafParts(child.getBody()));
            }
            return ret;
        } else {
            return Collections.singletonList(body);
        }
    }

    private static void checkLeafParts(MimeMessage msg, String... expectedParts) throws Exception {
        List actual = new ArrayList();
        for (Body leaf : getLeafParts(msg.getBody())) {
            actual.add(streamToString(MimeUtility.decodeBody(leaf)));
        }
        assertEquals(Arrays.asList(expectedParts), actual);
    }

    public static void testSinglePart7BitNoRecurse() throws Exception {
>>>>>>> f89b0548a6f2b1554f5adcc6b36b414afdb63a01:tests/src/com/fsck/k9/mail/internet/MimeMessageParseTest.java
        MimeMessage msg = parseWithoutRecurse(toStream(
                "From: \r\n" +
                "To: \r\n" +
Solution content 
        BinaryTempFileBody.setTempDirectory(new File(System.getProperty("java.io.tmpdir")));
    }

    @Test public void testSinglePart7BitNoRecurse() throws Exception {
        MimeMessage msg = parseWithoutRecurse(toStream(
                "From: \r\n" +
                "To: \r\n" +
File
MimeMessageParseTest.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Method signature