From 0e94aa5d9d02dd9b8a88b3b03eb279cb386b3dc3 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 1 Mar 2021 16:21:39 +0100
Subject: Moved SSL providers to new module

---
 .../src/free/java/de/danoeh/antennapod/core/ClientConfig.java | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'core/src/free')

diff --git a/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java b/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java
index 0193bf8ce..755bec14e 100644
--- a/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java
+++ b/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java
@@ -1,8 +1,8 @@
 package de.danoeh.antennapod.core;
 
 import android.content.Context;
-import java.security.Security;
-import org.conscrypt.Conscrypt;
+
+import de.danoeh.antennapod.net.ssl.SslProviderInstaller;
 
 import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.preferences.SleepTimerPreferences;
@@ -42,16 +42,11 @@ public class ClientConfig {
         UserPreferences.init(context);
         UsageStatistics.init(context);
         PlaybackPreferences.init(context);
-        installSslProvider(context);
+        SslProviderInstaller.install(context);
         NetworkUtils.init(context);
         AntennapodHttpClient.setCacheDirectory(new File(context.getCacheDir(), "okhttp"));
         SleepTimerPreferences.init(context);
         NotificationUtils.createChannels(context);
         initialized = true;
     }
-
-    private static void installSslProvider(Context context) {
-        // Insert bundled conscrypt as highest security provider (overrides OS version).
-        Security.insertProviderAt(Conscrypt.newProvider(), 1);
-    }
 }
-- 
cgit v1.2.3