wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #513 from maniac103/fix-cert-exception-handling

Browse source 
Don't throw CertificateValidationException for all SSLExceptions.
This commit is contained in:
cketti 2014-12-04 16:17:44 +01:00
commit b51ad495ed
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/com/fsck/k9/mail/store/ImapStore.java
View file

@ -23,6 +23,7 @@ import java.nio.charset.CharsetDecoder;
import java.nio.charset.CodingErrorAction;
import java.security.GeneralSecurityException;
import java.security.Security;
import java.security.cert.CertificateException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
@ -2616,7 +2617,11 @@ public class ImapStore extends Store {
}
} catch (SSLException e) {
throw new CertificateValidationException(e.getMessage(), e);
if (e.getCause() instanceof CertificateException) {
throw new CertificateValidationException(e.getMessage(), e);
} else {
throw e;
}
} catch (GeneralSecurityException gse) {
throw new MessagingException(
"Unable to open connection to IMAP server due to security error.", gse);