mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-27 00:13:13 +00:00
Code Issues Releases Wiki Activity

Fixed not recognizing cert errors

Browse source
This commit is contained in:
M66B 2020-01-12 19:10:10 +01:00
parent 0bb4282e5c
commit df59723f08
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/MailService.java
View file

@ -59,7 +59,6 @@ import javax.mail.Session;
import javax.mail.Store;
import javax.mail.event.StoreListener;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
@ -379,12 +378,15 @@ public class MailService implements AutoCloseable {
} else
throw new NoSuchProviderException(protocol);
} catch (MessagingException ex) {
if (factory != null &&
ex.getCause() instanceof SSLHandshakeException &&
ex.getCause().getCause() instanceof CertificateException)
throw new UntrustedException(factory.getFingerPrint(), ex);
else
throw ex;
if (factory != null) {
Throwable ce = ex;
while (ce != null) {
if (ce instanceof CertificateException)
throw new UntrustedException(factory.getFingerPrint(), ex);
ce = ce.getCause();
}
}
throw ex;
}
}