Fingerprint unlock fix

Author: sraptis-scy

README.md

@@ -54,6 +54,7 @@ The library supports the following features:
 | **Remote Presentation**    | OpenID for Verifiable Presentations 1.0                                 |                                                                                                                        |
 |                            | ClientID scheme                                                         | ✅ preregistered   <br /> ✅ x509_san_dns<br /> ✅ x509_hash <br /> ✅ redirect_uri                                        |
 |                            | DCQL                                                                    | ✅ support for credential_sets  <br />❌ support for claim_sets <br /> ❌ multiple credentials in CredentialQuery ignored |
+|                            | Transaction data                                                        | ❌                                                                                                                      |
 
 The library is written in Kotlin and is compatible with Java. It is distributed as a Maven package
 and can be included in any Android project that uses Android 8 (API level 26) or higher.

wallet-core/src/main/java/eu/europa/ec/eudi/wallet/issue/openid4vci/ProcessResponse.kt

@@ -24,6 +24,7 @@ import eu.europa.ec.eudi.wallet.internal.d
 import eu.europa.ec.eudi.wallet.issue.openid4vci.IssueEvent.Companion.failure
 import eu.europa.ec.eudi.wallet.issue.openid4vci.OpenId4VciManager.Companion.TAG
 import eu.europa.ec.eudi.wallet.logging.Logger
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
 
@@ -60,10 +61,14 @@ internal class ProcessResponse(
                                 signingAlgorithm = e.signingAlgorithm,
                                 keysRequireAuth = e.keysAndSecureAreas,
                                 resume = { keyUnlockData ->
-                                    cont.resume(keyUnlockData)
+                                    runBlocking {
+                                        cont.resume(keyUnlockData)
+                                    }
                                 },
                                 cancel = {
-                                    cont.cancel(IllegalStateException("Canceled"))
+                                    runBlocking {
+                                        cont.cancel(IllegalStateException("Canceled"))
+                                    }
                                 }
                             )
                         )

wallet-core/src/main/java/eu/europa/ec/eudi/wallet/issue/openid4vci/SubmitRequest.kt

@@ -28,6 +28,7 @@ import eu.europa.ec.eudi.openid4vci.SubmissionOutcome
 import eu.europa.ec.eudi.wallet.document.UnsignedDocument
 import eu.europa.ec.eudi.wallet.document.credential.ProofOfPossessionSigner
 import eu.europa.ec.eudi.wallet.provider.WalletAttestationsProvider
+import kotlinx.coroutines.runBlocking
 import org.multipaz.securearea.KeyUnlockData
 
 internal class SubmitRequest(
@@ -204,32 +205,36 @@ internal class SubmitRequest(
         val keyIndex = 0
         val proofsSpecification = ProofsSpecification.JwtProofs.WithKeyAttestation(
             proofSignerProvider = { nonce ->
-                try {
-                    val factory = KeyAttestationSigner.Factory(
-                        signers, keyIndex, walletAttestationsProvider, keyUnlockData
-                    )
-                    factory(nonce).getOrThrow().also { proofSigner = it }
-                } catch (e: Throwable) {
-
-                    val isUserAuthRequired = proofSigner.keyLockedException != null
-                    if (isUserAuthRequired) {
-                        val keysAndSecureAreas = mapOf(
-                            proofSigner.signer.let { it.keyAlias to it.secureArea }
-                        )
-                        throw UserAuthRequiredException(
-                            signingAlgorithm = proofSigner.signer.getKeyInfo().algorithm,
-                            keysAndSecureAreas = keysAndSecureAreas,
-                            resume = { keyUnlockData -> unlockResume(keyUnlockData) },
-                            cause = e
-                        )
-                    } else {
-                        throw e
-                    }
-                }
+                val factory = KeyAttestationSigner.Factory(
+                    signers, keyIndex, walletAttestationsProvider, keyUnlockData
+                )
+                factory(nonce).getOrThrow().also { proofSigner = it }
             },
             keyIndex = keyIndex,
         )
-        return with(issuer) { request(payload, proofsSpecification) }.getOrThrow()
+        try {
+            return with(issuer) { request(payload, proofsSpecification) }.getOrThrow()
+        } catch (e: Throwable) {
+
+            val isUserAuthRequired = proofSigner.keyLockedException != null
+            if (isUserAuthRequired) {
+                val keysAndSecureAreas = mapOf(
+                    proofSigner.signer.let { it.keyAlias to it.secureArea }
+                )
+                throw UserAuthRequiredException(
+                    signingAlgorithm = proofSigner.signer.getKeyInfo().algorithm,
+                    keysAndSecureAreas = keysAndSecureAreas,
+                    resume = { keyUnlockData ->
+                        runBlocking {
+                            unlockResume(keyUnlockData)
+                        }
+                    },
+                    cause = e
+                )
+            } else {
+                throw e
+            }
+        }
 
     }
 
@@ -256,7 +261,9 @@ internal class SubmitRequest(
                 throw UserAuthRequiredException(
                     signingAlgorithm = proofSigner.algorithm,
                     keysAndSecureAreas = keysAndSecureAreas,
-                    resume = { keyUnlockData -> unlockResume(keyUnlockData) },
+                    resume = { keyUnlockData -> runBlocking {
+                        unlockResume(keyUnlockData)
+                    } },
                     cause = e
                 )
             } else {