Fixed IPv6 SMTP EHLO

This commit is contained in:
M66B
2019-02-22 17:34:12 +01:00
parent 3fc0b6cb27
commit 35159f9865
3 changed files with 13 additions and 8 deletions

View File

@@ -52,6 +52,7 @@ import com.android.colorpicker.ColorPickerSwatch;
import com.google.android.material.snackbar.Snackbar;
import com.google.android.material.textfield.TextInputLayout;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
@@ -603,11 +604,12 @@ public class FragmentIdentity extends FragmentBase {
else
props.put("mail.smtps.localhost", host);
} else {
Log.i("Check local address=" + ip.getHostAddress());
String haddr = (ip instanceof Inet6Address ? "IPv6:" : "") + ip.getHostAddress();
Log.i("Check local address=" + haddr);
if (starttls)
props.put("mail.smtp.localaddress", ip.getHostAddress());
props.put("mail.smtp.localaddress", haddr);
else
props.put("mail.smtps.localaddress", ip.getHostAddress());
props.put("mail.smtps.localaddress", haddr);
}
// Create session