Remove legacy Chrome (< v138) support

Author: QZHelen

app/src/main/java/com/credman/cmwallet/CmWalletApplication.kt

@@ -85,17 +85,6 @@ class CmWalletApplication : Application() {
         applicationScope.launch {
             credentialRepo.credentialRegistryDatabase.collect { credentialDatabase ->
                 Log.i(TAG, "Credentials changed $credentialDatabase")
-                // Oid4vp draft 24
-                // For backward compatibility with Chrome
-                registryManager.registerCredentials(
-                    request = object : RegisterCredentialsRequest(
-                        "com.credman.IdentityCredential",
-                        "openid4vp",
-                        credentialDatabase,
-                        openId4VPDraft24Matcher
-                    ) {}
-                )
-                // In the future, should only register this type
                 registryManager.registerCredentials(
                     request = object : RegisterCredentialsRequest(
                         DigitalCredential.TYPE_DIGITAL_CREDENTIAL,
@@ -104,18 +93,6 @@ class CmWalletApplication : Application() {
                         openId4VPDraft24Matcher
                     ) {}
                 )
-
-                // Oid4vp 1.0 Candidate
-                // For backward compatibility with Chrome
-                registryManager.registerCredentials(
-                    request = object : RegisterCredentialsRequest(
-                        "com.credman.IdentityCredential",
-                        "openid4vp1.0",
-                        credentialDatabase,
-                        openId4VP1_0Matcher
-                    ) {}
-                )
-                // In the future, should only register this type
                 registryManager.registerCredentials(
                     request = object : RegisterCredentialsRequest(
                         DigitalCredential.TYPE_DIGITAL_CREDENTIAL,

app/src/main/java/com/credman/cmwallet/data/repository/CredentialRepository.kt

@@ -90,16 +90,6 @@ class CredentialRepository {
             PnvTokenRegistry.TEST_PNV_2_VERIFY_PHONE_NUMBER
         )
 
-        // For chrome < 138. Should be removed soon
-        registryManager.registerCredentials(
-            request = object : RegisterCredentialsRequest(
-                "com.credman.IdentityCredential",
-                "openid4vp1.0-pnv",
-                PnvTokenRegistry.buildRegistryDatabase(testPhoneNumberTokens),
-                pnvMatcher
-            ) {}
-        )
-        // For native apps and chrome 138+
         registryManager.registerCredentials(
             request = object : RegisterCredentialsRequest(
                 DigitalCredential.TYPE_DIGITAL_CREDENTIAL,

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

@@ -44,8 +44,6 @@ import com.credman.cmwallet.openid4vp.OpenId4VPMatchedSdJwtClaims
 import com.credman.cmwallet.pnv.maybeHandlePnv
 import com.credman.cmwallet.sdjwt.SdJwt
 import com.credman.cmwallet.toBase64UrlNoPadding
-import com.google.android.gms.identitycredentials.Credential
-import com.google.android.gms.identitycredentials.IntentHelper
 import org.json.JSONArray
 import org.json.JSONObject
 
@@ -135,10 +133,9 @@ fun createOpenID4VPResponse(
     val response = openId4VPRequest.generateResponse(vpToken)
     Log.d(TAG, "Returning $response")
     return DigitalCredentialResult(
-        responseJsonLegacy = response,
         authenticationTitle = authenticationTitle,
         authenticationSubtitle = authenticationSubtitle,
-        responseJsonModern = JSONObject().apply {
+        responseJson = JSONObject().apply {
             put("protocol", openId4VPRequest.protocolIdentifier)
             put("data", JSONObject(response))
         }.toString()
@@ -263,7 +260,7 @@ class GetCredentialActivity : FragmentActivity() {
                     if (pnvResponse != null) {
                         PendingIntentHandler.setGetCredentialResponse(
                             resultData,
-                            GetCredentialResponse(DigitalCredential(pnvResponse.responseJsonModern))
+                            GetCredentialResponse(DigitalCredential(pnvResponse.responseJson))
                         )
                         setResult(RESULT_OK, resultData)
                         finish()
@@ -292,24 +289,9 @@ class GetCredentialActivity : FragmentActivity() {
                             override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
                                 Log.d(TAG, "onAuthenticationSucceeded")
 
-                                // This is a temporary solution until Chrome migrate to use
-                                // the top level DC DigitalCredential json structure.
-                                // Long term, this should be replaced by a simple
-                                // `PendingIntentHandler.setGetCredentialResponse(intent, DigitalCredential(response.responseJson))` call.
-                                IntentHelper.setGetCredentialResponse(
-                                    resultData,
-                                    com.google.android.gms.identitycredentials.GetCredentialResponse(
-                                        Credential(
-                                            DigitalCredential.TYPE_DIGITAL_CREDENTIAL,
-                                            Bundle().apply {
-                                                putByteArray("identityToken", response.responseJsonLegacy.toByteArray())
-                                            }
-                                        )
-                                    )
-                                )
                                 PendingIntentHandler.setGetCredentialResponse(
                                     resultData,
-                                    GetCredentialResponse(DigitalCredential(response.responseJsonModern))
+                                    GetCredentialResponse(DigitalCredential(response.responseJson))
                                 )
 
                                 setResult(RESULT_OK, resultData)
@@ -355,11 +337,9 @@ class GetCredentialActivity : FragmentActivity() {
     }
 
     data class DigitalCredentialResult(
-        // New integration should no longer need this legacy setup
-        val responseJsonLegacy: String,
         val authenticationTitle: CharSequence,
         val authenticationSubtitle: CharSequence?,
-        val responseJsonModern: String, // Now we need to include the full DigitalCredential (i.e. {"protocol": ..., "data": ...}
+        val responseJson: String,
     )
 
     sealed class DigitalCredentialRequestOptions {

app/src/main/java/com/credman/cmwallet/pnv/PnvTokenRegistry.kt

@@ -27,7 +27,6 @@ import com.credman.cmwallet.pnv.PnvTokenRegistry.Companion.VCT_GET_PHONE_NUMBER
 import com.credman.cmwallet.pnv.PnvTokenRegistry.Companion.VCT_VERIFY_PHONE_NUMBER
 import com.credman.cmwallet.toBase64UrlNoPadding
 import com.credman.cmwallet.toJWK
-import io.ktor.util.encodeBase64
 import kotlinx.serialization.json.add
 import kotlinx.serialization.json.buildJsonArray
 import kotlinx.serialization.json.buildJsonObject
@@ -43,7 +42,6 @@ import java.security.KeyStore
 import java.security.MessageDigest
 import java.security.interfaces.ECPrivateKey
 import java.time.Instant
-import java.util.Enumeration
 
 /**
  * A phone number verification entry to be registered with the Credential Manager.
@@ -408,10 +406,9 @@ fun maybeHandlePnv(
     Log.d(PNV_TAG, "Returning $response")
 
     return DigitalCredentialResult(
-        responseJsonLegacy = "",
         authenticationTitle = "",
         authenticationSubtitle = null,
-        responseJsonModern = JSONObject().apply {
+        responseJson = JSONObject().apply {
             put("protocol", openId4VPRequest.protocolIdentifier)
             put("data", JSONObject(response))
         }.toString()