Merge branch 'master' into dev

12 months ago · 35de223f09
parent 7f8aebdbee 97d4d91abd
commit 35de223f09
1 changed files with 1 additions and 0 deletions
--- a/app/src/main/java/eu/faircode/email/ContactInfo.java
+++ b/app/src/main/java/eu/faircode/email/ContactInfo.java
@ -525,6 +525,7 @@ public class ContactInfo {
                                ex instanceof CertPathValidatorException ||
                                ex.getCause() instanceof CertPathValidatorException ||
                                ex.getCause() instanceof CertificateException ||
                                ex instanceof SSLHandshakeException ||
                                (ex instanceof SSLException &&
                                        "Unable to parse TLS packet header".equals(ex.getMessage())) ||
                                (ex instanceof IOException &&