Use Conscrypt when Play services are not available

Author: LaurentTreguier

app/build.gradle.kts

@@ -296,6 +296,7 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.coil.compose)
+    implementation(libs.conscrypt)
     implementation(libs.hilt)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.moshi)
@@ -330,8 +331,6 @@ dependencies {
     "googleImplementation"(libs.play.services.base)
     "googleImplementation"(libs.firebase.messaging)
 
-    "libreImplementation"(libs.conscrypt)
-
     debugImplementation(libs.androidx.ui.test.manifest)
     debugImplementation(libs.androidx.ui.tooling)
 

app/src/google/kotlin/app/fyreplace/fyreplace/SecureActivity.kt

@@ -5,6 +5,8 @@ import android.content.Intent
 import androidx.activity.ComponentActivity
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.gms.security.ProviderInstaller
+import org.conscrypt.Conscrypt
+import java.security.Security
 
 abstract class SecureActivity : ComponentActivity(), ProviderInstaller.ProviderInstallListener {
     private var hasShownWarning = false
@@ -32,6 +34,7 @@ abstract class SecureActivity : ComponentActivity(), ProviderInstaller.ProviderI
     override fun onProviderInstalled() = Unit
 
     private fun warnUser() {
+        Security.insertProviderAt(Conscrypt.newProvider(), 1)
         hasShownWarning = true
         AlertDialog.Builder(this)
             .setTitle(R.string.secure_warning_dialog_title)

app/src/legacyGoogle/kotlin/app/fyreplace/fyreplace/legacy/SecureApp.kt

@@ -2,10 +2,17 @@ package app.fyreplace.fyreplace.legacy
 
 import app.fyreplace.fyreplace.BaseApp
 import com.google.android.gms.security.ProviderInstaller
+import org.conscrypt.Conscrypt
+import java.security.Security
 
 abstract class SecureApp : BaseApp() {
     override fun onCreate() {
         super.onCreate()
-        ProviderInstaller.installIfNeeded(this)
+
+        try {
+            ProviderInstaller.installIfNeeded(this)
+        } catch (_: Exception) {
+            Security.insertProviderAt(Conscrypt.newProvider(), 1)
+        }
     }
 }

app/src/libre/kotlin/app/fyreplace/fyreplace/SecureActivity.kt

@@ -6,8 +6,8 @@ import org.conscrypt.Conscrypt
 import java.security.Security
 
 abstract class SecureActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    override fun onPostCreate(savedInstanceState: Bundle?) {
+        super.onPostCreate(savedInstanceState)
         Security.insertProviderAt(Conscrypt.newProvider(), 1)
     }
 }