From fd8889a6c6dc78989f4b91e45708645275dba41d Mon Sep 17 00:00:00 2001
From: Javinator9889 <dev@javinator9889.com>
Date: Fri, 26 Jun 2020 16:11:01 +0200
Subject: [PATCH] Removed Conscrypt support

---
 app/build.gradle                                            | 4 ++--
 .../handwashingreminder/activities/LauncherActivity.kt      | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5d8f177..c9988ff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,7 +40,7 @@ android {
         applicationId "com.javinator9889.handwashingreminder"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 130
+        versionCode 131
         versionName "1.2.0-${gitCommitHash}"
         multiDexEnabled true
         resConfigs "en", "es"
@@ -194,7 +194,7 @@ dependencies {
     // https://square.github.io/okio/#releases
     implementation 'com.squareup.okio:okio:2.5.0'
     // https://github.com/google/conscrypt/
-    implementation 'org.conscrypt:conscrypt-android:2.4.0'
+//    implementation 'org.conscrypt:conscrypt-android:2.4.0'
     // https://github.com/deano2390/MaterialShowcaseView
     implementation 'com.github.deano2390:MaterialShowcaseView:1.3.4'
     // https://github.com/PhilJay/MPAndroidChart
diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/activities/LauncherActivity.kt b/app/src/main/java/com/javinator9889/handwashingreminder/activities/LauncherActivity.kt
index 4cd1bfb..8698296 100644
--- a/app/src/main/java/com/javinator9889/handwashingreminder/activities/LauncherActivity.kt
+++ b/app/src/main/java/com/javinator9889/handwashingreminder/activities/LauncherActivity.kt
@@ -54,9 +54,7 @@ import com.mikepenz.iconics.Iconics
 import javinator9889.localemanager.utils.languagesupport.LanguagesSupport.Language
 import kotlinx.android.synthetic.main.splash_screen.*
 import kotlinx.coroutines.*
-import org.conscrypt.Conscrypt
 import timber.log.Timber
-import java.security.Security
 import com.javinator9889.handwashingreminder.utils.Firebase as FirebaseConf
 
 internal const val FAST_START_KEY = "intent:fast_start"
@@ -248,8 +246,8 @@ class LauncherActivity : AppCompatActivity() {
         Timber.d("Firebase initialized correctly")
         Timber.d("Initializing Iconics")
         Iconics.init(this)
-        Timber.d("Setting-up security providers")
-        Security.insertProviderAt(Conscrypt.newProvider(), 1)
+//        Timber.d("Setting-up security providers")
+//        Security.insertProviderAt(Conscrypt.newProvider(), 1)
         Timber.d("Setting-up activity recognition")
         val activityHandler = ActivityHandler.getInstance(this)
         if (sharedPreferences.getBoolean(