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

Catch handshake errors

This commit is contained in:
M66B 2021-07-07 09:55:49 +02:00
parent a33270a24e
commit 6489a41e6d
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/EmailProvider.java
View File

@ -820,10 +820,15 @@ public class EmailProvider implements Parcelable {
socket.setSoTimeout(SCAN_TIMEOUT);
try (SSLSocket sslSocket = starttls
? starttls(socket, context)
: (SSLSocket) socket) {
SSLSocket sslSocket = null;
try {
if (starttls)
sslSocket = starttls(socket, context);
else
sslSocket = (SSLSocket) socket;
sslSocket.startHandshake();
Certificate[] certs = sslSocket.getSession().getPeerCertificates();
for (Certificate cert : certs)
if (cert instanceof X509Certificate) {
@ -842,6 +847,13 @@ public class EmailProvider implements Parcelable {
// Typical:
// javax.net.ssl.SSLException: Unable to parse TLS packet header
EntityLog.log(context, "Handshake " + address + ": " + Log.formatThrowable(ex));
} finally {
try {
if (sslSocket != null)
sslSocket.close();
} catch (Throwable ex) {
Log.e(ex);
}
}
EntityLog.log(context, "Reachable " + address);