From 87802d8cf673b69f96e3be165e8a109fedc7a490 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 9 Dec 2023 16:06:05 +0100 Subject: [PATCH] Small change --- app/src/dummy/java/eu/faircode/email/SSLHelper.java | 2 +- app/src/main/java/eu/faircode/email/EmailService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/dummy/java/eu/faircode/email/SSLHelper.java b/app/src/dummy/java/eu/faircode/email/SSLHelper.java index 25e8e568ba..8785250898 100644 --- a/app/src/dummy/java/eu/faircode/email/SSLHelper.java +++ b/app/src/dummy/java/eu/faircode/email/SSLHelper.java @@ -21,7 +21,7 @@ public class SSLHelper { boolean secure, boolean cert_strict, String trustedFingerprint, ITrust intf) { - return rtm; + return null; } static boolean customTrustManager() { diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java index dfe73b5b3f..5b8092cd37 100644 --- a/app/src/main/java/eu/faircode/email/EmailService.java +++ b/app/src/main/java/eu/faircode/email/EmailService.java @@ -1099,7 +1099,7 @@ public class EmailService implements AutoCloseable { } catch (Throwable ex) { Log.e(ex); } - sslContext.init(km, new TrustManager[]{tm}, null); + sslContext.init(km, new TrustManager[]{tm == null ? rtm : tm}, null); } factory = sslContext.getSocketFactory();