Install ssl provider asynchronously

4 files changed, 7 insertions, 2 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 124394b64..7257537b1 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -28,6 +28,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.FeedItemlistDescriptionAdapter;
+import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.core.event.DownloadEvent;
 import de.danoeh.antennapod.core.event.FeedListUpdateEvent;
@@ -238,6 +239,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
 
         download = Observable.fromCallable(() -> {
                     feeds = DBReader.getFeedList();
+                    ClientConfig.installSslProvider(this);
                     downloader = new HttpDownloader(request);
                     downloader.call();
                     return downloader.getResult();
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 000f47f99..d5617ce4b 100644
--- a/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java
+++ b/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java
@@ -53,4 +53,7 @@ public class ClientConfig {
         initialized = true;
     }
 
+    public static void installSslProvider(Context context) {
+        // ProviderInstaller is a closed-source Google library
+    }
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index b8215232c..87ce10a5c 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -474,6 +474,7 @@ public class DownloadService extends Service {
                                   @NonNull List<? extends FeedItem> itemsEnqueued) {
         writeFileUrl(request);
 
+        ClientConfig.installSslProvider(this);
         Downloader downloader = downloaderFactory.create(request);
         if (downloader != null) {
             numberOfDownloads.incrementAndGet();
diff --git a/core/src/play/java/de/danoeh/antennapod/core/ClientConfig.java b/core/src/play/java/de/danoeh/antennapod/core/ClientConfig.java
index 51303797f..9aaebc2cc 100644
--- a/core/src/play/java/de/danoeh/antennapod/core/ClientConfig.java
+++ b/core/src/play/java/de/danoeh/antennapod/core/ClientConfig.java
@@ -64,7 +64,6 @@ public class ClientConfig {
         } else {
             Log.v(TAG, "Cast is disabled. All Cast-related initialization will be skipped.");
         }
-        installSslProvider(context);
         AntennapodHttpClient.setCacheDirectory(new File(context.getCacheDir(), "okhttp"));
         SleepTimerPreferences.init(context);
         RxJavaErrorHandlerSetup.setupRxJavaErrorHandler();
@@ -72,7 +71,7 @@ public class ClientConfig {
         initialized = true;
     }
 
-    private static void installSslProvider(Context context) {
+    public static void installSslProvider(Context context) {
         try {
             ProviderInstaller.installIfNeeded(context);
         } catch (GooglePlayServicesRepairableException e) {