Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-03 03:19:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Back to connecting to host name

Browse Source
This commit is contained in:
M66B
2020-03-14 18:20:23 +01:00
parent 508cbf1dc3
commit dca633710f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/EmailService.java
View File

@@ -360,17 +360,13 @@ public class EmailService implements AutoCloseable {
private void connect(
String host, int port, String user, String password,
SSLSocketFactoryService factory) throws MessagingException {
InetAddress main = null;
try {
//if (BuildConfig.DEBUG)
// throw new MailConnectException(
// new SocketConnectException("Debug", new IOException("Test"), host, port, 0));
main = InetAddress.getByName(host);
EntityLog.log(context, "Connecting to " + main);
_connect(main.getHostAddress(), port, user, password, factory);
} catch (UnknownHostException ex) {
throw new MessagingException("Unknown host " + host, ex);
EntityLog.log(context, "Connecting to " + host);
_connect(host, port, user, password, factory);
} catch (MessagingException ex) {
boolean ioError = false;
Throwable ce = ex;
@@ -383,8 +379,10 @@ public class EmailService implements AutoCloseable {
}
if (ioError) {
EntityLog.log(context, "Connect ex=" + ex.getMessage());
try {
// Some devices resolve IPv6 addresses while not having IPv6 connectivity
InetAddress main = InetAddress.getByName(host);
InetAddress[] iaddrs = InetAddress.getAllByName(host);
boolean ip4 = (main instanceof Inet4Address);
boolean ip6 = (main instanceof Inet6Address);