Revert "Some devices seem not to be able to connect to plain IP addresses"

This reverts commit 60b4f302e2.
pull/176/head
M66B 5 years ago
parent cd32cc786e
commit bcd56f8771

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

Loading…
Cancel
Save