mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-27 18:27:43 +00:00
Code Issues Releases Wiki Activity

Small improvement

Browse source
This commit is contained in:
M66B 2020-03-28 08:05:36 +01:00
parent 254364d29a
commit 7e6097bcf2
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/EmailService.java
View file

@ -363,13 +363,17 @@ 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));
EntityLog.log(context, "Connecting to " + host);
_connect(host, port, user, password, factory);
main = InetAddress.getByName(host);
EntityLog.log(context, "Connecting to " + main);
_connect(main.getHostAddress(), port, user, password, factory);
} catch (UnknownHostException ex) {
throw new MessagingException(ex.getMessage(), ex);
} catch (MessagingException ex) {
boolean ioError = false;
Throwable ce = ex;
@ -385,7 +389,6 @@ public class EmailService implements AutoCloseable {
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);
@ -431,7 +434,7 @@ public class EmailService implements AutoCloseable {
}
try {
EntityLog.log(context, "Falling back to " + iaddr.getHostAddress());
EntityLog.log(context, "Falling back to " + iaddr);
_connect(iaddr.getHostAddress(), port, user, password, factory);
return;
} catch (MessagingException ex1) {