Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-02 07:06:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed IPv6 SMTP EHLO

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@@ -73,6 +73,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.SocketException;
import java.net.SocketTimeoutException;
@@ -1947,11 +1948,12 @@ public class ServiceSynchronize extends LifecycleService {
else
props.put("mail.smtps.localhost", ident.host);
} else {
EntityLog.log(ServiceSynchronize.this, "Send local address=" + ip.getHostAddress());
String haddr = (ip instanceof Inet6Address ? "IPv6:" : "") + ip.getHostAddress();
EntityLog.log(ServiceSynchronize.this, "Send local address=" + haddr);
if (ident.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