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

Refactoring

This commit is contained in:
M66B 2022-03-13 11:46:26 +01:00
parent 65e3d6bdfb
commit 7e1c4fd8de
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/eu/faircode/email/Log.java
View File

@ -111,7 +111,6 @@ import java.lang.reflect.Array;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InterfaceAddress; import java.net.InterfaceAddress;
import java.net.NetworkInterface; import java.net.NetworkInterface;
import java.net.Socket;
import java.net.SocketException; import java.net.SocketException;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
@ -1588,14 +1587,6 @@ public class Log {
if (ex instanceof ConnectionException) if (ex instanceof ConnectionException)
return null; return null;
if (ex instanceof MailConnectException &&
ex.getCause() instanceof SocketTimeoutException)
ex = new Throwable("No response received from email server", ex);
if (ex instanceof MessagingException &&
ex.getCause() instanceof UnknownHostException)
ex = new Throwable("Email server address lookup failed", ex);
if (ex instanceof StoreClosedException || if (ex instanceof StoreClosedException ||
ex instanceof FolderClosedException || ex instanceof FolderClosedException ||
ex instanceof FolderClosedIOException || ex instanceof FolderClosedIOException ||
@ -1609,6 +1600,14 @@ public class Log {
return null; return null;
} }
if (ex instanceof MailConnectException &&
ex.getCause() instanceof SocketTimeoutException)
ex = new Throwable("No response received from email server", ex);
if (ex instanceof MessagingException &&
ex.getCause() instanceof UnknownHostException)
ex = new Throwable("Email server address lookup failed", ex);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (BuildConfig.DEBUG) if (BuildConfig.DEBUG)
sb.append(ex.toString()); sb.append(ex.toString());