Skip to content

Commit 249dbda

Browse files
SaintPatrckSaintPatrck
authored
[PM-15057] Rename Fido2CredentialRequest to Fido2CreateCredentialRequest (#4362)
1 parent dbb006d commit 249dbda

23 files changed

+170
-170
lines changed

‎app/src/main/java/com/x8bit/bitwarden/MainViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ class MainViewModel @Inject constructor(
325325
fido2CredentialManager.isUserVerified = false
326326
specialCircumstanceManager.specialCircumstance =
327327
SpecialCircumstance.Fido2Save(
328-
fido2CredentialRequest = fido2CredentialRequestData,
328+
fido2CreateCredentialRequest = fido2CredentialRequestData,
329329
)
330330

331331
// Switch accounts if the selected user is not the active user.

‎app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import androidx.credentials.provider.CallingAppInfo
44
import com.bitwarden.vault.CipherView
55
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
66
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionResult
7-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialRequest
7+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
88
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2RegisterCredentialResult
99
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2ValidateOriginResult
1010
import com.x8bit.bitwarden.data.autofill.fido2.model.PasskeyAssertionOptions
@@ -53,7 +53,7 @@ interface Fido2CredentialManager {
5353
*/
5454
suspend fun registerFido2Credential(
5555
userId: String,
56-
fido2CredentialRequest: Fido2CredentialRequest,
56+
fido2CreateCredentialRequest: Fido2CreateCredentialRequest,
5757
selectedCipherView: CipherView,
5858
): Fido2RegisterCredentialResult
5959

‎app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerImpl.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.x8bit.bitwarden.data.autofill.fido2.datasource.network.model.DigitalA
1010
import com.x8bit.bitwarden.data.autofill.fido2.datasource.network.service.DigitalAssetLinkService
1111
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
1212
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionResult
13-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialRequest
13+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
1414
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2RegisterCredentialResult
1515
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2ValidateOriginResult
1616
import com.x8bit.bitwarden.data.autofill.fido2.model.PasskeyAssertionOptions
@@ -53,31 +53,31 @@ class Fido2CredentialManagerImpl(
5353

5454
override suspend fun registerFido2Credential(
5555
userId: String,
56-
fido2CredentialRequest: Fido2CredentialRequest,
56+
fido2CreateCredentialRequest: Fido2CreateCredentialRequest,
5757
selectedCipherView: CipherView,
5858
): Fido2RegisterCredentialResult {
59-
val clientData = if (fido2CredentialRequest.callingAppInfo.isOriginPopulated()) {
60-
fido2CredentialRequest
59+
val clientData = if (fido2CreateCredentialRequest.callingAppInfo.isOriginPopulated()) {
60+
fido2CreateCredentialRequest
6161
.callingAppInfo
6262
.getAppSigningSignatureFingerprint()
6363
?.let { ClientData.DefaultWithCustomHash(hash = it) }
6464
?: return Fido2RegisterCredentialResult.Error
6565
} else {
6666
ClientData.DefaultWithExtraData(
67-
androidPackageName = fido2CredentialRequest
67+
androidPackageName = fido2CreateCredentialRequest
6868
.callingAppInfo
6969
.packageName,
7070
)
7171
}
72-
val assetLinkUrl = fido2CredentialRequest
72+
val assetLinkUrl = fido2CreateCredentialRequest
7373
.origin
74-
?: getOriginUrlFromAttestationOptionsOrNull(fido2CredentialRequest.requestJson)
74+
?: getOriginUrlFromAttestationOptionsOrNull(fido2CreateCredentialRequest.requestJson)
7575
?: return Fido2RegisterCredentialResult.Error
7676

7777
val origin = Origin.Android(
7878
UnverifiedAssetLink(
79-
packageName = fido2CredentialRequest.packageName,
80-
sha256CertFingerprint = fido2CredentialRequest
79+
packageName = fido2CreateCredentialRequest.packageName,
80+
sha256CertFingerprint = fido2CreateCredentialRequest
8181
.callingAppInfo
8282
.getSignatureFingerprintAsHexString()
8383
?: return Fido2RegisterCredentialResult.Error,
@@ -91,7 +91,7 @@ class Fido2CredentialManagerImpl(
9191
request = RegisterFido2CredentialRequest(
9292
userId = userId,
9393
origin = origin,
94-
requestJson = """{"publicKey": ${fido2CredentialRequest.requestJson}}""",
94+
requestJson = """{"publicKey": ${fido2CreateCredentialRequest.requestJson}}""",
9595
clientData = clientData,
9696
selectedCipherView = selectedCipherView,
9797
// User verification is handled prior to engaging the SDK. We always respond

‎app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/model/Fido2CredentialRequest.kt renamed to ‎app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/model/Fido2CreateCredentialRequest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import kotlinx.parcelize.Parcelize
1414
* @property callingAppInfo Information about the application that initiated the request.
1515
*/
1616
@Parcelize
17-
data class Fido2CredentialRequest(
17+
data class Fido2CreateCredentialRequest(
1818
val userId: String,
1919
val requestJson: String,
2020
val packageName: String,

‎app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/util/Fido2IntentUtils.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ import androidx.credentials.GetPublicKeyCredentialOption
77
import androidx.credentials.provider.BeginGetPublicKeyCredentialOption
88
import androidx.credentials.provider.PendingIntentHandler
99
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
10-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialRequest
10+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
1111
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2GetCredentialsRequest
1212
import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow
1313
import com.x8bit.bitwarden.ui.platform.manager.intent.EXTRA_KEY_CIPHER_ID
1414
import com.x8bit.bitwarden.ui.platform.manager.intent.EXTRA_KEY_CREDENTIAL_ID
1515
import com.x8bit.bitwarden.ui.platform.manager.intent.EXTRA_KEY_USER_ID
1616

1717
/**
18-
* Checks if this [Intent] contains a [Fido2CredentialRequest] related to an ongoing FIDO 2
18+
* Checks if this [Intent] contains a [Fido2CreateCredentialRequest] related to an ongoing FIDO 2
1919
* credential creation process.
2020
*/
21-
fun Intent.getFido2CredentialRequestOrNull(): Fido2CredentialRequest? {
21+
fun Intent.getFido2CredentialRequestOrNull(): Fido2CreateCredentialRequest? {
2222
if (isBuildVersionBelow(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) return null
2323

2424
val systemRequest = PendingIntentHandler
@@ -33,7 +33,7 @@ fun Intent.getFido2CredentialRequestOrNull(): Fido2CredentialRequest? {
3333
val userId = getStringExtra(EXTRA_KEY_USER_ID)
3434
?: return null
3535

36-
return Fido2CredentialRequest(
36+
return Fido2CreateCredentialRequest(
3737
userId = userId,
3838
requestJson = createPublicKeyRequest.requestJson,
3939
packageName = systemRequest.callingAppInfo.packageName,

‎app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/SpecialCircumstance.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.platform.manager.model
22

33
import android.os.Parcelable
44
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
5-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialRequest
5+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
66
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2GetCredentialsRequest
77
import com.x8bit.bitwarden.data.autofill.model.AutofillSaveItem
88
import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData
@@ -65,7 +65,7 @@ sealed class SpecialCircumstance : Parcelable {
6565
*/
6666
@Parcelize
6767
data class Fido2Save(
68-
val fido2CredentialRequest: Fido2CredentialRequest,
68+
val fido2CreateCredentialRequest: Fido2CreateCredentialRequest,
6969
) : SpecialCircumstance()
7070

7171
/**

‎app/src/main/java/com/x8bit/bitwarden/data/platform/manager/util/SpecialCircumstanceExtensions.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.x8bit.bitwarden.data.platform.manager.util
22

33
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
4-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialRequest
4+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
55
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2GetCredentialsRequest
66
import com.x8bit.bitwarden.data.autofill.model.AutofillSaveItem
77
import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData
@@ -27,11 +27,11 @@ fun SpecialCircumstance.toAutofillSelectionDataOrNull(): AutofillSelectionData?
2727
}
2828

2929
/**
30-
* Returns [Fido2CredentialRequest] when contained in the given [SpecialCircumstance].
30+
* Returns [Fido2CreateCredentialRequest] when contained in the given [SpecialCircumstance].
3131
*/
32-
fun SpecialCircumstance.toFido2RequestOrNull(): Fido2CredentialRequest? =
32+
fun SpecialCircumstance.toFido2RequestOrNull(): Fido2CreateCredentialRequest? =
3333
when (this) {
34-
is SpecialCircumstance.Fido2Save -> this.fido2CredentialRequest
34+
is SpecialCircumstance.Fido2Save -> this.fido2CreateCredentialRequest
3535
else -> null
3636
}
3737

‎app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.x8bit.bitwarden.data.auth.repository.model.AuthState
88
import com.x8bit.bitwarden.data.auth.repository.model.UserState
99
import com.x8bit.bitwarden.data.auth.repository.util.parseJwtTokenDataOrNull
1010
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
11-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialRequest
11+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
1212
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2GetCredentialsRequest
1313
import com.x8bit.bitwarden.data.autofill.model.AutofillSaveItem
1414
import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData
@@ -133,7 +133,7 @@ class RootNavViewModel @Inject constructor(
133133
is SpecialCircumstance.Fido2Save -> {
134134
RootNavState.VaultUnlockedForFido2Save(
135135
activeUserId = userState.activeUserId,
136-
fido2CredentialRequest = specialCircumstance.fido2CredentialRequest,
136+
fido2CreateCredentialRequest = specialCircumstance.fido2CreateCredentialRequest,
137137
)
138138
}
139139

@@ -286,12 +286,12 @@ sealed class RootNavState : Parcelable {
286286
*
287287
* @param activeUserId ID of the active user. Indirectly used to notify [RootNavViewModel] the
288288
* active user has changed.
289-
* @param fido2CredentialRequest System request containing FIDO credential data.
289+
* @param fido2CreateCredentialRequest System request containing FIDO credential data.
290290
*/
291291
@Parcelize
292292
data class VaultUnlockedForFido2Save(
293293
val activeUserId: String,
294-
val fido2CredentialRequest: Fido2CredentialRequest,
294+
val fido2CreateCredentialRequest: Fido2CreateCredentialRequest,
295295
) : RootNavState()
296296

297297
/**

‎app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import com.x8bit.bitwarden.data.auth.repository.model.ValidatePasswordResult
1212
import com.x8bit.bitwarden.data.auth.repository.model.ValidatePinResult
1313
import com.x8bit.bitwarden.data.auth.repository.model.VaultUnlockType
1414
import com.x8bit.bitwarden.data.autofill.fido2.manager.Fido2CredentialManager
15-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialRequest
15+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
1616
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2RegisterCredentialResult
1717
import com.x8bit.bitwarden.data.autofill.fido2.model.UserVerificationRequirement
1818
import com.x8bit.bitwarden.data.autofill.util.isActiveWithFido2Credentials
@@ -449,7 +449,7 @@ class VaultAddEditViewModel @Inject constructor(
449449
}
450450

451451
private fun handleFido2RequestSpecialCircumstance(
452-
request: Fido2CredentialRequest,
452+
request: Fido2CreateCredentialRequest,
453453
cipherView: CipherView,
454454
) {
455455
if (cipherView.isActiveWithFido2Credentials) {
@@ -462,7 +462,7 @@ class VaultAddEditViewModel @Inject constructor(
462462
}
463463

464464
private fun registerFido2Credential(
465-
request: Fido2CredentialRequest,
465+
request: Fido2CreateCredentialRequest,
466466
cipherView: CipherView,
467467
) {
468468

@@ -494,7 +494,7 @@ class VaultAddEditViewModel @Inject constructor(
494494
}
495495

496496
private fun registerFido2CredentialToCipher(
497-
request: Fido2CredentialRequest,
497+
request: Fido2CreateCredentialRequest,
498498
cipherView: CipherView,
499499
) {
500500
viewModelScope.launch {
@@ -506,7 +506,7 @@ class VaultAddEditViewModel @Inject constructor(
506506
val result: Fido2RegisterCredentialResult =
507507
fido2CredentialManager.registerFido2Credential(
508508
userId = userId,
509-
fido2CredentialRequest = request,
509+
fido2CreateCredentialRequest = request,
510510
selectedCipherView = cipherView,
511511
)
512512
sendAction(

‎app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/Fido2CredentialRequestExtensions.kt renamed to ‎app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/Fido2CreateCredentialRequestExtensions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.x8bit.bitwarden.ui.vault.feature.addedit.util
22

3-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialRequest
3+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
44
import com.x8bit.bitwarden.data.autofill.fido2.model.PasskeyAttestationOptions
55
import com.x8bit.bitwarden.data.platform.util.toUriOrNull
66
import com.x8bit.bitwarden.ui.platform.base.util.toAndroidAppUriString
@@ -12,7 +12,7 @@ import java.util.UUID
1212
* Returns pre-filled content that may be used for an "add" type
1313
* [VaultAddEditState.ViewState.Content] during FIDO 2 credential creation.
1414
*/
15-
fun Fido2CredentialRequest.toDefaultAddTypeContent(
15+
fun Fido2CreateCredentialRequest.toDefaultAddTypeContent(
1616
attestationOptions: PasskeyAttestationOptions?,
1717
isIndividualVaultDisabled: Boolean,
1818
): VaultAddEditState.ViewState.Content {

‎app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilitySele
1515
import com.x8bit.bitwarden.data.autofill.fido2.manager.Fido2CredentialManager
1616
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionRequest
1717
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialAssertionResult
18-
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CredentialRequest
18+
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest
1919
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2GetCredentialsRequest
2020
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2GetCredentialsResult
2121
import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2RegisterCredentialResult
@@ -133,7 +133,7 @@ class VaultItemListingViewModel @Inject constructor(
133133
autofillSelectionData = specialCircumstance?.toAutofillSelectionDataOrNull(),
134134
hasMasterPassword = userState.activeAccount.hasMasterPassword,
135135
totpData = specialCircumstance?.toTotpDataOrNull(),
136-
fido2CredentialRequest = fido2CredentialRequest,
136+
fido2CreateCredentialRequest = fido2CredentialRequest,
137137
fido2CredentialAssertionRequest = specialCircumstance?.toFido2AssertionRequestOrNull(),
138138
fido2GetCredentialsRequest = specialCircumstance?.toFido2GetCredentialsRequestOrNull(),
139139
isPremium = userState.activeAccount.isPremium,
@@ -156,7 +156,7 @@ class VaultItemListingViewModel @Inject constructor(
156156

157157
viewModelScope.launch {
158158
state
159-
.fido2CredentialRequest
159+
.fido2CreateCredentialRequest
160160
?.let { request ->
161161
sendAction(
162162
VaultItemListingsAction.Internal.Fido2RegisterCredentialRequestReceive(
@@ -625,7 +625,7 @@ class VaultItemListingViewModel @Inject constructor(
625625

626626
private fun registerFido2Credential(cipherView: CipherView) {
627627
val credentialRequest = state
628-
.fido2CredentialRequest
628+
.fido2CreateCredentialRequest
629629
?: run {
630630
// This scenario should not occur because `isFido2Creation` is false when
631631
// `fido2CredentialRequest` is null. We show the FIDO 2 error dialog to inform
@@ -653,7 +653,7 @@ class VaultItemListingViewModel @Inject constructor(
653653
}
654654

655655
private fun performUserVerificationIfRequired(
656-
credentialRequest: Fido2CredentialRequest,
656+
credentialRequest: Fido2CreateCredentialRequest,
657657
cipherView: CipherView,
658658
) {
659659
val attestationOptions = fido2CredentialManager
@@ -691,7 +691,7 @@ class VaultItemListingViewModel @Inject constructor(
691691
}
692692

693693
private fun registerFido2CredentialToCipher(
694-
request: Fido2CredentialRequest,
694+
request: Fido2CreateCredentialRequest,
695695
cipherView: CipherView,
696696
) {
697697
val activeUserId = authRepository.activeUserId
@@ -703,7 +703,7 @@ class VaultItemListingViewModel @Inject constructor(
703703
val result: Fido2RegisterCredentialResult =
704704
fido2CredentialManager.registerFido2Credential(
705705
userId = activeUserId,
706-
fido2CredentialRequest = request,
706+
fido2CreateCredentialRequest = request,
707707
selectedCipherView = cipherView,
708708
)
709709
sendAction(
@@ -826,7 +826,7 @@ class VaultItemListingViewModel @Inject constructor(
826826
private fun handleDismissFido2ErrorDialogClick() {
827827
clearDialogState()
828828
when {
829-
state.fido2CredentialRequest != null -> {
829+
state.fido2CreateCredentialRequest != null -> {
830830
sendEvent(
831831
VaultItemListingEvent.CompleteFido2Registration(
832832
result = Fido2RegisterCredentialResult.Error,
@@ -1575,7 +1575,7 @@ class VaultItemListingViewModel @Inject constructor(
15751575
baseIconUrl = state.baseIconUrl,
15761576
isIconLoadingDisabled = state.isIconLoadingDisabled,
15771577
autofillSelectionData = state.autofillSelectionData,
1578-
fido2CreationData = state.fido2CredentialRequest,
1578+
fido2CreationData = state.fido2CreateCredentialRequest,
15791579
fido2CredentialAutofillViews = vaultData
15801580
.fido2CredentialAutofillViewList,
15811581
totpData = state.totpData,
@@ -1636,7 +1636,7 @@ class VaultItemListingViewModel @Inject constructor(
16361636
*/
16371637
@Suppress("MaxLineLength")
16381638
private suspend fun DataState<VaultData>.filterForFido2CreationIfNecessary(): DataState<VaultData> {
1639-
val request = state.fido2CredentialRequest ?: return this
1639+
val request = state.fido2CreateCredentialRequest ?: return this
16401640
return this.map { vaultData ->
16411641
val matchUri = request.origin
16421642
?: request.packageName
@@ -1739,7 +1739,7 @@ data class VaultItemListingState(
17391739
private val isPullToRefreshSettingEnabled: Boolean,
17401740
val totpData: TotpData? = null,
17411741
val autofillSelectionData: AutofillSelectionData? = null,
1742-
val fido2CredentialRequest: Fido2CredentialRequest? = null,
1742+
val fido2CreateCredentialRequest: Fido2CreateCredentialRequest? = null,
17431743
val fido2CredentialAssertionRequest: Fido2CredentialAssertionRequest? = null,
17441744
val fido2GetCredentialsRequest: Fido2GetCredentialsRequest? = null,
17451745
val hasMasterPassword: Boolean,
@@ -1763,7 +1763,7 @@ data class VaultItemListingState(
17631763
* Whether or not this represents a listing screen for FIDO2 creation.
17641764
*/
17651765
val isFido2Creation: Boolean
1766-
get() = fido2CredentialRequest != null
1766+
get() = fido2CreateCredentialRequest != null
17671767

17681768
/**
17691769
* Whether or not this represents a listing screen for totp.
@@ -1778,7 +1778,7 @@ data class VaultItemListingState(
17781778
?.uri
17791779
?.toHostOrPathOrNull()
17801780
?.let { R.string.items_for_uri.asText(it) }
1781-
?: fido2CredentialRequest
1781+
?: fido2CreateCredentialRequest
17821782
?.callingAppInfo
17831783
?.getFido2RpIdOrNull()
17841784
?.let { R.string.items_for_uri.asText(it) }
@@ -2549,7 +2549,7 @@ sealed class VaultItemListingsAction {
25492549
* Indicates that a FIDO 2 credential registration has been received.
25502550
*/
25512551
data class Fido2RegisterCredentialRequestReceive(
2552-
val request: Fido2CredentialRequest,
2552+
val request: Fido2CreateCredentialRequest,
25532553
) : Internal()
25542554

25552555
/**

0 commit comments

Comments
 (0)