From 965aef3a1b2601ec2ecd779a3e0f6db843d654e2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 17 Dec 2019 13:01:32 +0100
Subject: [PATCH] Use Android trust manager

---
 app/src/main/java/eu/faircode/email/MailService.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/MailService.java b/app/src/main/java/eu/faircode/email/MailService.java
index 7e88157602..0e42e94740 100644
--- a/app/src/main/java/eu/faircode/email/MailService.java
+++ b/app/src/main/java/eu/faircode/email/MailService.java
@@ -23,6 +23,7 @@ import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.security.GeneralSecurityException;
+import java.security.KeyStore;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
@@ -48,6 +49,7 @@ import javax.mail.Session;
 import javax.mail.Store;
 import javax.mail.event.StoreListener;
 import javax.net.ssl.SSLSocket;
+import javax.net.ssl.TrustManagerFactory;
 
 public class MailService implements AutoCloseable {
     private Context context;
@@ -129,6 +131,10 @@ public class MailService implements AutoCloseable {
                 }
             };
 
+            TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            tmf.init((KeyStore) null);
+            sf.setTrustManagers(tmf.getTrustManagers());
+
             properties.put("mail." + protocol + ".ssl.socketFactory", sf);
             properties.put("mail." + protocol + ".socketFactory.fallback", "false");
         } catch (GeneralSecurityException ex) {