mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This reverts commit 60b4f302e2.
This commit is contained in:
M66B 2020-03-14 13:20:25 +01:00
parent cd32cc786e
commit bcd56f8771
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,13 +360,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("Unknown host " + host, ex);
} catch (MessagingException ex) {
boolean ioError = false;
Throwable ce = ex;
@ -381,7 +385,6 @@ public class EmailService implements AutoCloseable {
if (ioError) {
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);