Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-05-15 20:08:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Workaround '501 Syntactically invalid HELO argument(s)'

Browse Source
This commit is contained in:
M66B
2020-01-22 20:43:44 +01:00
parent afbcd2dc69
commit b82f10dd80
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/eu/faircode/email/MailService.java
View File

@@ -364,33 +364,31 @@ public class MailService implements AutoCloseable {
} else if ("smtp".equals(protocol) || "smtps".equals(protocol)) {
String[] c = BuildConfig.APPLICATION_ID.split("\\.");
Collections.reverse(Arrays.asList(c));
String domain = TextUtils.join(".", c);
String hdomain = TextUtils.join(".", c);
String haddr = domain;
if (useip)
try {
// This assumes getByName always returns the same address (type)
InetAddress addr = InetAddress.getByName(host);
if (addr instanceof Inet4Address)
haddr = "[" + Inet4Address.getLocalHost().getHostAddress() + "]";
else
haddr = "[IPv6:" + Inet6Address.getLocalHost().getHostAddress() + "]";
} catch (UnknownHostException ex) {
Log.w(ex);
}
String haddr = "[127.0.0.1]";
try {
// This assumes getByName always returns the same address (type)
InetAddress addr = InetAddress.getByName(host);
if (addr instanceof Inet4Address)
haddr = "[" + Inet4Address.getLocalHost().getHostAddress() + "]";
else
haddr = "[IPv6:" + Inet6Address.getLocalHost().getHostAddress() + "]";
} catch (UnknownHostException ex) {
Log.w(ex);
}
Log.i("Using localhost=" + haddr);
properties.put("mail." + protocol + ".localhost", haddr);
properties.put("mail." + protocol + ".localhost", useip ? haddr : hdomain);
iservice = isession.getTransport(protocol);
try {
iservice.connect(host, port, user, password);
} catch (MessagingException ex) {
if (useip &&
ex.getMessage() != null &&
if (ex.getMessage() != null &&
ex.getMessage().toLowerCase().contains("syntactically invalid")) {
Log.w("Using localhost=" + domain, ex);
((SMTPTransport) iservice).setLocalHost(domain);
Log.w("Using localhost=" + (useip ? hdomain : haddr), ex);
((SMTPTransport) iservice).setLocalHost(useip ? hdomain : haddr);
iservice.connect(host, port, user, password);
} else
throw ex;