From 97b33b93fa74ae21dc1b58c156b26d92f86ba951 Mon Sep 17 00:00:00 2001 From: xynngh Date: Sat, 12 Sep 2020 13:10:26 +0400 Subject: [PATCH] Try not to crash if Conscrypt can't be loaded --- .../yetanothercallblocker/utils/DeferredInit.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/utils/DeferredInit.java b/app/src/main/java/dummydomain/yetanothercallblocker/utils/DeferredInit.java index 1fcab73..c8106b6 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/utils/DeferredInit.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/utils/DeferredInit.java @@ -1,11 +1,15 @@ package dummydomain.yetanothercallblocker.utils; import org.conscrypt.Conscrypt; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.security.Security; public class DeferredInit { + private static final Logger LOG = LoggerFactory.getLogger(DeferredInit.class); + private static boolean networkInitialized; private static final Object NETWORK_INIT_LOCK = new Object(); @@ -15,7 +19,11 @@ public class DeferredInit { synchronized (NETWORK_INIT_LOCK) { if (networkInitialized) return; - Security.insertProviderAt(Conscrypt.newProvider(), 1); + try { + Security.insertProviderAt(Conscrypt.newProvider(), 1); + } catch (Throwable t) { + LOG.warn("initNetwork()", t); + } networkInitialized = true; }