ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "SmtpSender: Send EHLO that adheres to RFC2821"

Browse Source
This commit is contained in:
Ben Komalo 2011-07-11 09:01:53 -07:00 committed by Android (Google) Code Review
commit b0a14e4f1a
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/email/mail/transport/SmtpSender.java
View File

@ -16,6 +16,10 @@
package com.android.email.mail.transport;
import android.content.Context;
import android.util.Base64;
import android.util.Log;
import com.android.email.Email;
import com.android.email.mail.Sender;
import com.android.email.mail.Transport;
@ -29,11 +33,8 @@ import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent.Message;
import com.android.emailcommon.provider.HostAuth;
import android.content.Context;
import android.util.Log;
import android.util.Base64;
import java.io.IOException;
import java.net.Inet6Address;
import java.net.InetAddress;
import javax.net.ssl.SSLException;
@ -111,10 +112,18 @@ public class SmtpSender extends Sender {
executeSimpleCommand(null);
String localHost = "localhost";
// Try to get local address in the X.X.X.X format.
// Try to get local address in the proper format.
InetAddress localAddress = mTransport.getLocalAddress();
if (localAddress != null) {
localHost = localAddress.getHostAddress();
// Address Literal formatted in accordance to RFC2821 Sec. 4.1.3
StringBuilder sb = new StringBuilder();
sb.append('[');
if (localAddress instanceof Inet6Address) {
sb.append("IPv6:");
}
sb.append(localAddress.getHostAddress());
sb.append(']');
localHost = sb.toString();
}
String result = executeSimpleCommand("EHLO " + localHost);