Pass scope only where needed

Author: sunkup

lib/src/main/java/at/bitfire/cert4android/CustomCertManager.kt

@@ -24,12 +24,12 @@ import javax.net.ssl.X509TrustManager
 @SuppressLint("CustomX509TrustManager")
 class CustomCertManager @JvmOverloads constructor(
     context: Context,
-    scope: CoroutineScope,
+    private val scope: CoroutineScope,
     val trustSystemCerts: Boolean = true,
     private val getUserDecision: suspend (X509Certificate) -> Boolean
 ): X509TrustManager {
 
-    val certStore = CustomCertStore.getInstance(context, scope)
+    val certStore = CustomCertStore.getInstance(context)
 
 
     @Throws(CertificateException::class)
@@ -47,7 +47,7 @@ class CustomCertManager @JvmOverloads constructor(
      */
     @Throws(CertificateException::class)
     override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {
-        if (!certStore.isTrusted(chain, authType, trustSystemCerts, getUserDecision))
+        if (!certStore.isTrusted(chain, authType, trustSystemCerts, scope, getUserDecision))
             throw CertificateException("Certificate chain not trusted")
     }
 
@@ -71,7 +71,7 @@ class CustomCertManager @JvmOverloads constructor(
             // Allow users to explicitly accept certificates that have a bad hostname here
             (session.peerCertificates.firstOrNull() as? X509Certificate)?.let { cert ->
                 // Check without trusting system certificates so that the user will be asked even for system-trusted certificates
-                if (certStore.isTrusted(arrayOf(cert), "RSA", false, getUserDecision))
+                if (certStore.isTrusted(arrayOf(cert), "RSA", false, scope, getUserDecision))
                     return true
             }
 

lib/src/main/java/at/bitfire/cert4android/CustomCertStore.kt

@@ -22,7 +22,6 @@ import java.util.logging.Level
 
 class CustomCertStore internal constructor(
     private val context: Context,
-    private val scope: CoroutineScope,
     private val userTimeout: Long = 60000L
 ) {
 
@@ -35,12 +34,12 @@ class CustomCertStore internal constructor(
         private var instance: CustomCertStore? = null
 
         @Synchronized
-        fun getInstance(context: Context, scope: CoroutineScope): CustomCertStore {
+        fun getInstance(context: Context): CustomCertStore {
             instance?.let {
                 return it
             }
 
-            val newInstance = CustomCertStore(context.applicationContext, scope)
+            val newInstance = CustomCertStore(context.applicationContext)
             instance = newInstance
             return newInstance
         }
@@ -82,6 +81,7 @@ class CustomCertStore internal constructor(
         chain: Array<X509Certificate>,
         authType: String,
         trustSystemCerts: Boolean,
+        scope: CoroutineScope,
         getUserDecision: suspend (X509Certificate) -> Boolean
     ): Boolean {
         if (chain.isEmpty())
@@ -110,11 +110,11 @@ class CustomCertStore internal constructor(
         }
 
         return runBlocking {
-            val ui = UserDecisionRegistry.getInstance(context, scope)
+            val ui = UserDecisionRegistry.getInstance(context)
 
             try {
                 withTimeout(userTimeout) {
-                    ui.check(cert, getUserDecision)
+                    ui.check(cert, scope, getUserDecision)
                 }
             } catch (_: TimeoutCancellationException) {
                 Cert4Android.log.log(Level.WARNING, "User timeout while waiting for certificate decision, rejecting")

lib/src/main/java/at/bitfire/cert4android/UserDecisionRegistry.kt

@@ -10,8 +10,7 @@ import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 
 class UserDecisionRegistry private constructor(
-    private val context: Context,
-    private val scope: CoroutineScope
+    private val context: Context
 ) {
 
     companion object {
@@ -20,12 +19,12 @@ class UserDecisionRegistry private constructor(
         private var instance: UserDecisionRegistry? = null
 
         @Synchronized
-        fun getInstance(context: Context, scope: CoroutineScope): UserDecisionRegistry {
+        fun getInstance(context: Context): UserDecisionRegistry {
             instance?.let {
                 return it
             }
 
-            val newInstance = UserDecisionRegistry(context.applicationContext, scope)
+            val newInstance = UserDecisionRegistry(context.applicationContext)
             instance = newInstance
             return newInstance
         }
@@ -45,6 +44,7 @@ class UserDecisionRegistry private constructor(
      */
     suspend fun check(
         cert: X509Certificate,
+        scope: CoroutineScope,
         getUserDecision: suspend (X509Certificate) -> Boolean
     ): Boolean = suspendCancellableCoroutine { cont ->
         cont.invokeOnCancellation {
@@ -67,16 +67,17 @@ class UserDecisionRegistry private constructor(
             }
         }
 
-        if (requestDecision)
+        if (requestDecision) {
             scope.launch {
-                val userDecision = getUserDecision(cert)
+                val userDecision = getUserDecision(cert) // Suspends until user decision is made
                 onUserDecision(cert, userDecision)
             }
+        }
     }
 
     fun onUserDecision(cert: X509Certificate, trusted: Boolean) {
         // save decision
-        val customCertStore = CustomCertStore.getInstance(context, scope)
+        val customCertStore = CustomCertStore.getInstance(context)
         if (trusted)
             customCertStore.setTrustedByUser(cert)
         else

sample-app/src/main/java/at/bitfire/cert4android/demo/MainActivity.kt

@@ -194,7 +194,7 @@ class MainActivity : ComponentActivity() {
         }
 
         fun reset() = viewModelScope.launch(Dispatchers.IO) {
-            CustomCertStore.getInstance(getApplication(), viewModelScope).clearUserDecisions()
+            CustomCertStore.getInstance(getApplication()).clearUserDecisions()
         }
 
         fun testAccess(url: String, trustSystemCerts: Boolean = true) =