From 32d0ca7bcdede9955f6928dbd1cd262716f0658f Mon Sep 17 00:00:00 2001 From: David Perez Date: Thu, 1 May 2025 11:49:58 -0500 Subject: [PATCH] PM-21088: Remove the unused IgnoreEnvironmentCheck feature flag (#5119) --- .../bitwarden/data/platform/manager/model/FlagKey.kt | 10 ---------- .../debugmenu/components/FeatureFlagListItems.kt | 2 -- app/src/main/res/values/strings_non_localized.xml | 1 - .../data/auth/repository/AuthRepositoryTest.kt | 1 - .../bitwarden/data/platform/manager/FlagKeyTest.kt | 5 ----- .../feature/debugmenu/DebugMenuViewModelTest.kt | 2 -- 6 files changed, 21 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/FlagKey.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/FlagKey.kt index 3ddd8a4cf2..003683ecde 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/FlagKey.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/FlagKey.kt @@ -34,7 +34,6 @@ sealed class FlagKey { VerifiedSsoDomainEndpoint, CredentialExchangeProtocolImport, CredentialExchangeProtocolExport, - IgnoreEnvironmentCheck, MutualTls, SingleTapPasskeyCreation, SingleTapPasskeyAuthentication, @@ -149,15 +148,6 @@ sealed class FlagKey { override val isRemotelyConfigured: Boolean = true } - /** - * Data object holding the feature flag key to ignore an environment check. - */ - data object IgnoreEnvironmentCheck : FlagKey() { - override val keyName: String = "ignore-environment-check" - override val defaultValue: Boolean = false - override val isRemotelyConfigured: Boolean = false - } - /** * Data object holding the feature flag key for the Mutual TLS feature. */ diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt index 719d68f362..176c4c7df6 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt @@ -34,7 +34,6 @@ fun FlagKey.ListItemContent( FlagKey.CredentialExchangeProtocolImport, FlagKey.CredentialExchangeProtocolExport, FlagKey.CipherKeyEncryption, - FlagKey.IgnoreEnvironmentCheck, FlagKey.MutualTls, FlagKey.SingleTapPasskeyCreation, FlagKey.SingleTapPasskeyAuthentication, @@ -94,7 +93,6 @@ private fun FlagKey.getDisplayLabel(): String = when (this) { FlagKey.CredentialExchangeProtocolImport -> stringResource(R.string.cxp_import) FlagKey.CredentialExchangeProtocolExport -> stringResource(R.string.cxp_export) FlagKey.CipherKeyEncryption -> stringResource(R.string.cipher_key_encryption) - FlagKey.IgnoreEnvironmentCheck -> stringResource(R.string.ignore_environment_check) FlagKey.MutualTls -> stringResource(R.string.mutual_tls) FlagKey.SingleTapPasskeyCreation -> stringResource(R.string.single_tap_passkey_creation) FlagKey.SingleTapPasskeyAuthentication -> { diff --git a/app/src/main/res/values/strings_non_localized.xml b/app/src/main/res/values/strings_non_localized.xml index f58be6deb1..5f58a26156 100644 --- a/app/src/main/res/values/strings_non_localized.xml +++ b/app/src/main/res/values/strings_non_localized.xml @@ -21,7 +21,6 @@ Show Onboarding Carousel This will force the change to app state which will cause the first time carousel to show. The carousel will continue to show for any \"new\" account until a login is completed. May need to exit debug menu manually. Cipher Key Encryption - Ignore environment check"> Reset all coach mark tours AnonAddy self-hosted aliases SimpleLogin self-hosted aliases diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt index 8af4899693..1620d69270 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt @@ -257,7 +257,6 @@ class AuthRepositoryTest { private val featureFlagManager: FeatureFlagManager = mockk(relaxed = true) { every { getFeatureFlag(FlagKey.OnboardingFlow) } returns false - every { getFeatureFlag(FlagKey.IgnoreEnvironmentCheck) } returns false } private val firstTimeActionManager = mockk { diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FlagKeyTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FlagKeyTest.kt index 5090f14627..8b392cbdb6 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FlagKeyTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FlagKeyTest.kt @@ -53,10 +53,6 @@ class FlagKeyTest { FlagKey.SingleTapPasskeyAuthentication.keyName, "single-tap-passkey-authentication", ) - assertEquals( - FlagKey.IgnoreEnvironmentCheck.keyName, - "ignore-environment-check", - ) assertEquals( FlagKey.MutualTls.keyName, "mutual-tls", @@ -137,7 +133,6 @@ class FlagKeyTest { assertTrue( listOf( - FlagKey.IgnoreEnvironmentCheck, FlagKey.FlightRecorder, FlagKey.PreAuthSettings, ).all { diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/debugmenu/DebugMenuViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/debugmenu/DebugMenuViewModelTest.kt index 8672c66f33..f3a395a75d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/debugmenu/DebugMenuViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/debugmenu/DebugMenuViewModelTest.kt @@ -128,7 +128,6 @@ private val DEFAULT_MAP_VALUE: ImmutableMap, Any> = persistentMapOf FlagKey.VerifiedSsoDomainEndpoint to true, FlagKey.CredentialExchangeProtocolImport to true, FlagKey.CredentialExchangeProtocolExport to true, - FlagKey.IgnoreEnvironmentCheck to true, FlagKey.MutualTls to true, FlagKey.SingleTapPasskeyCreation to true, FlagKey.SingleTapPasskeyAuthentication to true, @@ -149,7 +148,6 @@ private val UPDATED_MAP_VALUE: ImmutableMap, Any> = persistentMapOf FlagKey.VerifiedSsoDomainEndpoint to false, FlagKey.CredentialExchangeProtocolImport to false, FlagKey.CredentialExchangeProtocolExport to false, - FlagKey.IgnoreEnvironmentCheck to false, FlagKey.MutualTls to false, FlagKey.SingleTapPasskeyCreation to false, FlagKey.SingleTapPasskeyAuthentication to false,