Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Presentation during issuance fixes. #795

Merged
merged 1 commit into from
Nov 22, 2024
Merged

Presentation during issuance fixes. #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...issuance/src/main/java/com/android/identity/issuance/evidence/EvidenceRequestOpenid4Vp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
2 changes: 1 addition & 1 deletion identity-issuance/src/main/java/com/android/identity/issuance/funke/FunkeProofingState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 3 additions & 1 deletion .../android/identity_credential/wallet/ui/destination/provisioncredential/EvidenceRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion wallet/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down