wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify MAIL FROM formatting logic

Browse source
This commit is contained in:
Vincent Breitmoser 2017-09-01 15:36:45 +02:00
parent e529542bba
commit f88537284f
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
k9mail-library/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java
View file

@ -423,9 +423,6 @@ public class SmtpTransport extends Transport {
close();
open();
if (!is8bitEncodingAllowed) {
Timber.d("Server does not support 8bit transfer encoding");
}
// If the message has attachments and our server has told us about a limit on
// the size of messages, count the message's size before sending it
if (largestAcceptableMessage > 0 && message.hasAttachments()) {
@ -435,16 +432,13 @@ public class SmtpTransport extends Transport {
}
boolean entireMessageSent = false;
Address[] from = message.getFrom();
try {
String fromAddress = from[0].getAddress();
String mailFrom = constructSmtpMailFromCommand(message.getFrom(), is8bitEncodingAllowed);
if (isPipeliningSupported) {
Queue<String> pipelinedCommands = new LinkedList<>();
if (is8bitEncodingAllowed) {
pipelinedCommands.add(String.format("MAIL FROM:<%s> BODY=8BITMIME", fromAddress));
} else {
pipelinedCommands.add(String.format("MAIL FROM:<%s>", fromAddress));
}
pipelinedCommands.add(mailFrom);
for (String address : addresses) {
pipelinedCommands.add(String.format("RCPT TO:<%s>", address));
@ -453,13 +447,8 @@ public class SmtpTransport extends Transport {
pipelinedCommands.add("DATA");
executePipelinedCommands(pipelinedCommands);
readPipelinedResponse(pipelinedCommands);
} else {
if (is8bitEncodingAllowed) {
executeCommand("MAIL FROM:<%s> BODY=8BITMIME", fromAddress);
} else {
executeCommand("MAIL FROM:<%s>", fromAddress);
}
executeCommand(mailFrom);
for (String address : addresses) {
executeCommand("RCPT TO:<%s>", address);
@ -489,6 +478,16 @@ public class SmtpTransport extends Transport {
}
private static String constructSmtpMailFromCommand(Address[] from, boolean is8bitEncodingAllowed) {
String fromAddress = from[0].getAddress();
if (is8bitEncodingAllowed) {
return String.format("MAIL FROM:<%s> BODY=8BITMIME", fromAddress);
} else {
Timber.d("Server does not support 8bit transfer encoding");
return String.format("MAIL FROM:<%s>", fromAddress);
}
}
@Override
public void close() {
try {