diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt index e745315e62..341694b4e1 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt @@ -31,7 +31,6 @@ fun FlagKey.ListItemContent( FlagKey.CipherKeyEncryption, FlagKey.UserManagedPrivilegedApps, FlagKey.RemoveCardPolicy, - FlagKey.EnrollAeadOnKeyRotation, -> { @Suppress("UNCHECKED_CAST") BooleanFlagItem( @@ -84,8 +83,4 @@ private fun FlagKey.getDisplayLabel(): String = when (this) { FlagKey.BitwardenAuthenticationEnabled -> { stringResource(BitwardenString.bitwarden_authentication_enabled) } - - FlagKey.EnrollAeadOnKeyRotation -> { - stringResource(BitwardenString.enroll_aead_on_key_rotation) - } } diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt index a825fad4c2..5c6c2c7342 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt @@ -28,7 +28,6 @@ fun FlagKey.ListItemContent( FlagKey.CredentialExchangeProtocolImport, FlagKey.RemoveCardPolicy, FlagKey.UserManagedPrivilegedApps, - FlagKey.EnrollAeadOnKeyRotation, -> BooleanFlagItem( label = flagKey.getDisplayLabel(), key = flagKey as FlagKey, @@ -77,8 +76,4 @@ private fun FlagKey.getDisplayLabel(): String = when (this) { FlagKey.BitwardenAuthenticationEnabled -> { stringResource(BitwardenString.bitwarden_authentication_enabled) } - - FlagKey.EnrollAeadOnKeyRotation -> { - stringResource(BitwardenString.enroll_aead_on_key_rotation) - } } diff --git a/core/src/main/kotlin/com/bitwarden/core/data/manager/model/FlagKey.kt b/core/src/main/kotlin/com/bitwarden/core/data/manager/model/FlagKey.kt index 477b9a3787..c2ad8d30f9 100644 --- a/core/src/main/kotlin/com/bitwarden/core/data/manager/model/FlagKey.kt +++ b/core/src/main/kotlin/com/bitwarden/core/data/manager/model/FlagKey.kt @@ -89,14 +89,6 @@ sealed class FlagKey { override val defaultValue: Boolean = false } - /** - * Represents the feature flag to enable the enrollment of AEAD on key rotation. - */ - data object EnrollAeadOnKeyRotation : FlagKey() { - override val keyName: String = "enroll-aead-on-key-rotation" - override val defaultValue: Boolean = false - } - //region Dummy keys for testing /** * Data object holding the key for a [Boolean] flag to be used in tests. diff --git a/core/src/test/kotlin/com/bitwarden/core/data/manager/model/FlagKeyTest.kt b/core/src/test/kotlin/com/bitwarden/core/data/manager/model/FlagKeyTest.kt index b2cfb18614..b620912d5a 100644 --- a/core/src/test/kotlin/com/bitwarden/core/data/manager/model/FlagKeyTest.kt +++ b/core/src/test/kotlin/com/bitwarden/core/data/manager/model/FlagKeyTest.kt @@ -32,10 +32,6 @@ class FlagKeyTest { FlagKey.BitwardenAuthenticationEnabled.keyName, "bitwarden-authentication-enabled", ) - assertEquals( - FlagKey.EnrollAeadOnKeyRotation.keyName, - "enroll-aead-on-key-rotation", - ) } @Test @@ -48,7 +44,6 @@ class FlagKeyTest { FlagKey.UserManagedPrivilegedApps, FlagKey.RemoveCardPolicy, FlagKey.BitwardenAuthenticationEnabled, - FlagKey.EnrollAeadOnKeyRotation, ).all { !it.defaultValue }, diff --git a/ui/src/main/res/values/strings_non_localized.xml b/ui/src/main/res/values/strings_non_localized.xml index 0d4dd6a7fd..efb1d557ca 100644 --- a/ui/src/main/res/values/strings_non_localized.xml +++ b/ui/src/main/res/values/strings_non_localized.xml @@ -28,7 +28,6 @@ 2FAS (no password) LastPass (.json) Aegis (.json) - Enroll AEAD on key rotation