From 70e768ba05badaebabfa51bf1e03917d9bc72028 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 17 Jul 2026 12:19:17 -0400
Subject: [PATCH] Allow registration demo to run on minSdk 23.

---
 demo/registration/build.gradle.kts            |  5 ++++-
 .../sample/RegistrationApplication.kt         | 22 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/demo/registration/build.gradle.kts b/demo/registration/build.gradle.kts
index 241adc723a..152440ea3a 100644
--- a/demo/registration/build.gradle.kts
+++ b/demo/registration/build.gradle.kts
@@ -18,7 +18,7 @@ android {
     versionCode = 1
     versionName = "1.0"
 
-    minSdk = 26
+    minSdk = 23
     targetSdk = 34
   }
 
@@ -66,6 +66,9 @@ dependencies {
   // libsignal-protocol for PreKeyCollection types
   implementation(libs.libsignal.client)
 
+  // Bundled TLS provider, required for TLS to work on older API levels
+  implementation(libs.conscrypt.android)
+
   // Kotlin serialization for JSON parsing
   implementation(libs.kotlinx.serialization.json)
 
diff --git a/demo/registration/src/main/java/org/signal/registration/sample/RegistrationApplication.kt b/demo/registration/src/main/java/org/signal/registration/sample/RegistrationApplication.kt
index 89c111e991..d45b9a7a44 100644
--- a/demo/registration/src/main/java/org/signal/registration/sample/RegistrationApplication.kt
+++ b/demo/registration/src/main/java/org/signal/registration/sample/RegistrationApplication.kt
@@ -6,8 +6,11 @@
 package org.signal.registration.sample
 
 import android.app.Application
+import android.app.NotificationChannel
+import android.app.NotificationManager
 import android.os.Build
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.conscrypt.Conscrypt
 import org.signal.core.models.ServiceId.ACI
 import org.signal.core.models.ServiceId.PNI
 import org.signal.core.ui.CoreUiDependencies
@@ -29,11 +32,14 @@ import org.signal.registration.sample.storage.RegistrationPreferences
 import org.whispersystems.signalservice.api.util.CredentialsProvider
 import org.whispersystems.signalservice.internal.push.PushServiceSocket
 import java.io.InputStream
+import java.security.Security
 import java.util.Optional
 
 class RegistrationApplication : Application() {
 
   companion object {
+    private val TAG = Log.tag(RegistrationApplication::class)
+
     // Staging SVR2 mrEnclave value
     private const val SVR2_MRENCLAVE = "97f151f6ed078edbbfd72fa9cae694dcc08353f1f5e8d9ccd79a971b10ffc535"
 
@@ -45,6 +51,7 @@ class RegistrationApplication : Application() {
     super.onCreate()
 
     Log.initialize(AndroidLogger)
+    initializeSecurityProvider()
 
     RegistrationPreferences.init(this)
     createDeviceTransferNotificationChannel()
@@ -90,12 +97,21 @@ class RegistrationApplication : Application() {
     )
   }
 
+  private fun initializeSecurityProvider() {
+    val position = Security.insertProviderAt(Conscrypt.newProvider(), 1)
+    Log.i(TAG, "Installed Conscrypt provider: $position")
+  }
+
   private fun createDeviceTransferNotificationChannel() {
-    val manager = getSystemService(android.app.NotificationManager::class.java) ?: return
-    val channel = android.app.NotificationChannel(
+    if (Build.VERSION.SDK_INT < 26) {
+      return
+    }
+
+    val manager = getSystemService(NotificationManager::class.java) ?: return
+    val channel = NotificationChannel(
       DemoNetworkController.DEVICE_TRANSFER_NOTIFICATION_CHANNEL_ID,
       "Device transfer",
-      android.app.NotificationManager.IMPORTANCE_LOW
+      NotificationManager.IMPORTANCE_LOW
     )
     manager.createNotificationChannel(channel)
   }