mirror of
https://github.com/bitwarden/android.git
synced 2026-04-29 04:18:52 -05:00
[PM-24652] Remove AEAD enrollment on key rotation feature flag (#5695)
This commit is contained in:
@@ -31,7 +31,6 @@ fun <T : Any> FlagKey<T>.ListItemContent(
|
|||||||
FlagKey.CipherKeyEncryption,
|
FlagKey.CipherKeyEncryption,
|
||||||
FlagKey.UserManagedPrivilegedApps,
|
FlagKey.UserManagedPrivilegedApps,
|
||||||
FlagKey.RemoveCardPolicy,
|
FlagKey.RemoveCardPolicy,
|
||||||
FlagKey.EnrollAeadOnKeyRotation,
|
|
||||||
-> {
|
-> {
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
BooleanFlagItem(
|
BooleanFlagItem(
|
||||||
@@ -84,8 +83,4 @@ private fun <T : Any> FlagKey<T>.getDisplayLabel(): String = when (this) {
|
|||||||
FlagKey.BitwardenAuthenticationEnabled -> {
|
FlagKey.BitwardenAuthenticationEnabled -> {
|
||||||
stringResource(BitwardenString.bitwarden_authentication_enabled)
|
stringResource(BitwardenString.bitwarden_authentication_enabled)
|
||||||
}
|
}
|
||||||
|
|
||||||
FlagKey.EnrollAeadOnKeyRotation -> {
|
|
||||||
stringResource(BitwardenString.enroll_aead_on_key_rotation)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ fun <T : Any> FlagKey<T>.ListItemContent(
|
|||||||
FlagKey.CredentialExchangeProtocolImport,
|
FlagKey.CredentialExchangeProtocolImport,
|
||||||
FlagKey.RemoveCardPolicy,
|
FlagKey.RemoveCardPolicy,
|
||||||
FlagKey.UserManagedPrivilegedApps,
|
FlagKey.UserManagedPrivilegedApps,
|
||||||
FlagKey.EnrollAeadOnKeyRotation,
|
|
||||||
-> BooleanFlagItem(
|
-> BooleanFlagItem(
|
||||||
label = flagKey.getDisplayLabel(),
|
label = flagKey.getDisplayLabel(),
|
||||||
key = flagKey as FlagKey<Boolean>,
|
key = flagKey as FlagKey<Boolean>,
|
||||||
@@ -77,8 +76,4 @@ private fun <T : Any> FlagKey<T>.getDisplayLabel(): String = when (this) {
|
|||||||
FlagKey.BitwardenAuthenticationEnabled -> {
|
FlagKey.BitwardenAuthenticationEnabled -> {
|
||||||
stringResource(BitwardenString.bitwarden_authentication_enabled)
|
stringResource(BitwardenString.bitwarden_authentication_enabled)
|
||||||
}
|
}
|
||||||
|
|
||||||
FlagKey.EnrollAeadOnKeyRotation -> {
|
|
||||||
stringResource(BitwardenString.enroll_aead_on_key_rotation)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -89,14 +89,6 @@ sealed class FlagKey<out T : Any> {
|
|||||||
override val defaultValue: Boolean = false
|
override val defaultValue: Boolean = false
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents the feature flag to enable the enrollment of AEAD on key rotation.
|
|
||||||
*/
|
|
||||||
data object EnrollAeadOnKeyRotation : FlagKey<Boolean>() {
|
|
||||||
override val keyName: String = "enroll-aead-on-key-rotation"
|
|
||||||
override val defaultValue: Boolean = false
|
|
||||||
}
|
|
||||||
|
|
||||||
//region Dummy keys for testing
|
//region Dummy keys for testing
|
||||||
/**
|
/**
|
||||||
* Data object holding the key for a [Boolean] flag to be used in tests.
|
* Data object holding the key for a [Boolean] flag to be used in tests.
|
||||||
|
|||||||
@@ -32,10 +32,6 @@ class FlagKeyTest {
|
|||||||
FlagKey.BitwardenAuthenticationEnabled.keyName,
|
FlagKey.BitwardenAuthenticationEnabled.keyName,
|
||||||
"bitwarden-authentication-enabled",
|
"bitwarden-authentication-enabled",
|
||||||
)
|
)
|
||||||
assertEquals(
|
|
||||||
FlagKey.EnrollAeadOnKeyRotation.keyName,
|
|
||||||
"enroll-aead-on-key-rotation",
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -48,7 +44,6 @@ class FlagKeyTest {
|
|||||||
FlagKey.UserManagedPrivilegedApps,
|
FlagKey.UserManagedPrivilegedApps,
|
||||||
FlagKey.RemoveCardPolicy,
|
FlagKey.RemoveCardPolicy,
|
||||||
FlagKey.BitwardenAuthenticationEnabled,
|
FlagKey.BitwardenAuthenticationEnabled,
|
||||||
FlagKey.EnrollAeadOnKeyRotation,
|
|
||||||
).all {
|
).all {
|
||||||
!it.defaultValue
|
!it.defaultValue
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -28,7 +28,6 @@
|
|||||||
<string name="import_format_label_2fas_json">2FAS (no password)</string>
|
<string name="import_format_label_2fas_json">2FAS (no password)</string>
|
||||||
<string name="import_format_label_lastpass_json">LastPass (.json)</string>
|
<string name="import_format_label_lastpass_json">LastPass (.json)</string>
|
||||||
<string name="import_format_label_aegis_json">Aegis (.json)</string>
|
<string name="import_format_label_aegis_json">Aegis (.json)</string>
|
||||||
<string name="enroll_aead_on_key_rotation">Enroll AEAD on key rotation</string>
|
|
||||||
|
|
||||||
<!-- endregion Debug Menu -->
|
<!-- endregion Debug Menu -->
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Reference in New Issue
Block a user