Did 3 things:

1. Fixed #1
2. Updated dependencies
3. Dynamically generate protocol identifier in the Digital Credentails response

Author: QZHelen

app/build.gradle.kts

@@ -48,7 +48,6 @@ dependencies {
     implementation(libs.ktor.serialization.kotlinx.json)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.registry.digitalcredentials.mdoc)
-    implementation(libs.androidx.registry.digitalcredentials.preview)
     implementation(libs.androidx.registry.provider)
     implementation(libs.androidx.credentials)
     implementation(libs.play.services.identity.credentials)

app/src/main/java/com/credman/cmwallet/getcred/GetCredentialActivity.kt

@@ -69,7 +69,7 @@ fun createOpenID4VPResponse(
                 sdJwtVc.present(
                     claims,
                     nonce = openId4VPRequest.nonce,
-                    clientId = openId4VPRequest.clientId
+                    aud = openId4VPRequest.getSdJwtKbAud(origin)
                 )
             )
         }
@@ -129,7 +129,7 @@ fun createOpenID4VPResponse(
         authenticationTitle = authenticationTitle,
         authenticationSubtitle = authenticationSubtitle,
         responseJsonModern = JSONObject().apply {
-            put("protocol", "openid4vp")
+            put("protocol", openId4VPRequest.protocolIdentifier)
             put("data", JSONObject(response))
         }.toString()
     )

app/src/main/java/com/credman/cmwallet/openid4vp/OpenId4VP.kt

@@ -23,6 +23,12 @@ class OpenId4VP(
     val protocolIdentifier: String = "openid4vp",
 ) {
 
+    fun getSdJwtKbAud(origin: String) = when (protocolIdentifier) {
+        in IDENTIFIERS_1_0 -> "origin:$origin"
+        IDENTIFIER_DRAFT_24 -> clientId
+        else -> throw UnsupportedOperationException("Unsupported protocol idenfitier $protocolIdentifier")
+    }
+
     val nonce: String
 
     val dcqlQuery: JSONObject

app/src/main/java/com/credman/cmwallet/sdjwt/SdJwt.kt

@@ -40,7 +40,7 @@ class SdJwt(
     fun present(
         claimSets: JSONArray?, // If null, match all
         nonce: String,
-        clientId: String
+        aud: String,
     ): String {
         val sdJwtComponents = mutableListOf(issuerJwt)
         if (claimSets == null) {
@@ -90,7 +90,7 @@ class SdJwt(
         }
         val kbPayload = buildJsonObject {
             put("iat", Instant.now().epochSecond)
-            put("aud", clientId)
+            put("aud", aud)
             put("nonce", nonce)
             put("sd_hash", digest)
         }

gradle/libs.versions.toml

@@ -22,7 +22,6 @@ androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref =
 androidx-credentials = { module = "androidx.credentials:credentials" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose" }
 androidx-registry-digitalcredentials-mdoc = { module = "androidx.credentials.registry:registry-digitalcredentials-mdoc", version.ref = "registryDigitalcredentialsMdoc" }
-androidx-registry-digitalcredentials-preview = { module = "androidx.credentials.registry:registry-digitalcredentials-preview", version.ref = "registryDigitalcredentialsMdoc" }
 androidx-registry-provider = { module = "androidx.credentials.registry:registry-provider", version.ref = "registryDigitalcredentialsMdoc" }
 androidx-registry-provider-play-services = { module = "androidx.credentials.registry:registry-provider-play-services", version.ref = "registryDigitalcredentialsMdoc" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "roomRuntime" }