Presentation during issuance fixes. (#795)

Signed-off-by: Peter Sorotokin <[email protected]>
openwallet-foundation-labs · Nov 22, 2024 · 981f6dd · 981f6dd
1 parent b902862
commit 981f6dd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/...issuance/src/main/java/com/android/identity/issuance/evidence/EvidenceRequestOpenid4Vp.kt b/...issuance/src/main/java/com/android/identity/issuance/evidence/EvidenceRequestOpenid4Vp.kt
@@ -2,5 +2,6 @@ package com.android.identity.issuance.evidence
 
 class EvidenceRequestOpenid4Vp(
     val originUri: String,
-    val request: String
+    val request: String,
+    val cancelText: String? = null
 ): EvidenceRequest()
diff --git a/identity-issuance/src/main/java/com/android/identity/issuance/funke/FunkeProofingState.kt b/identity-issuance/src/main/java/com/android/identity/issuance/funke/FunkeProofingState.kt
@@ -125,7 +125,7 @@ class FunkeProofingState(
                     } else {
                         if (openid4VpRequest != null) {
                             val uri = URI(authorizationMetadata.authorizationChallengeEndpoint!!)
-                            val origin = uri.scheme + ":" + uri.authority
+                            val origin = uri.scheme + "//:" + uri.authority
                             list.add(EvidenceRequestOpenid4Vp(origin, openid4VpRequest!!))
                         }
                         list.add(EvidenceRequestWeb(authorizeUrl, proofingInfo.landingUrl))

diff --git a/.../android/identity_credential/wallet/ui/destination/provisioncredential/EvidenceRequest.kt b/.../android/identity_credential/wallet/ui/destination/provisioncredential/EvidenceRequest.kt
@@ -1746,7 +1746,9 @@ fun EvidenceRequestOpenid4Vp(
                 modifier = Modifier.padding(8.dp),
                 onClick = {provisioningViewModel.moveToNextEvidenceRequest()}
             ) {
-                Text(text = stringResource(id = R.string.presentation_evidence_cancel))
+                Text(text = evidenceRequest.cancelText ?:
+                    stringResource(id = R.string.presentation_evidence_cancel)
+                )
             }
         }
     }

diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
@@ -402,7 +402,7 @@
         You can do this by presenting the eID you have in your wallet.
     </string>
     <string name="presentation_evidence_ok">Present eID</string>
-    <string name="presentation_evidence_cancel">Cancel</string>
+    <string name="presentation_evidence_cancel">Use Web Browser</string>
 
     <!-- Accessibility -->
     <string name="accessibility_go_back_icon">Go back</string>