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 6b950e1563..31e9a4a86b 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 @@ -35,6 +35,7 @@ sealed class FlagKey { ForceUpdateKdfSettings, CipherKeyEncryption, NoLogoutOnKdfChange, + MigrateMyVaultToMyItems, ) } } @@ -89,6 +90,14 @@ sealed class FlagKey { override val defaultValue: Boolean = false } + /** + * Data object holding the feature flag key for the Migrate My Vault to My Items feature. + */ + data object MigrateMyVaultToMyItems : FlagKey() { + override val keyName: String = "pm-20558-migrate-myvault-to-myitems" + 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 aa28de31fc..cc42ceb602 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 @@ -28,6 +28,10 @@ class FlagKeyTest { FlagKey.ForceUpdateKdfSettings.keyName, "pm-18021-force-update-kdf-settings", ) + assertEquals( + FlagKey.MigrateMyVaultToMyItems.keyName, + "pm-20558-migrate-myvault-to-myitems", + ) } @Test @@ -39,6 +43,7 @@ class FlagKeyTest { FlagKey.CipherKeyEncryption, FlagKey.BitwardenAuthenticationEnabled, FlagKey.ForceUpdateKdfSettings, + FlagKey.MigrateMyVaultToMyItems, ).all { !it.defaultValue }, diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/debug/FeatureFlagListItems.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/debug/FeatureFlagListItems.kt index fbad9acb4d..f21d983315 100644 --- a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/debug/FeatureFlagListItems.kt +++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/debug/FeatureFlagListItems.kt @@ -29,6 +29,7 @@ fun FlagKey.ListItemContent( FlagKey.CipherKeyEncryption, FlagKey.ForceUpdateKdfSettings, FlagKey.NoLogoutOnKdfChange, + FlagKey.MigrateMyVaultToMyItems, -> { @Suppress("UNCHECKED_CAST") BooleanFlagItem( @@ -78,4 +79,5 @@ private fun FlagKey.getDisplayLabel(): String = when (this) { FlagKey.BitwardenAuthenticationEnabled -> { stringResource(BitwardenString.bitwarden_authentication_enabled) } + FlagKey.MigrateMyVaultToMyItems -> stringResource(BitwardenString.migrate_my_vault_to_my_items) } diff --git a/ui/src/main/res/values/strings_non_localized.xml b/ui/src/main/res/values/strings_non_localized.xml index 4495a77df6..8e10925d87 100644 --- a/ui/src/main/res/values/strings_non_localized.xml +++ b/ui/src/main/res/values/strings_non_localized.xml @@ -38,6 +38,7 @@ Aegis (.json) Force update KDF settings Avoid logout on KDF change + Migrate My Vault to My Items