From 368ca49fd6df6757ff7426c6f280a4071e19531f Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Mon, 16 Sep 2024 15:00:00 -0500
Subject: [PATCH] Add BitwardenLegacyAppComponents for legacy app component
 names (#3922)

---
 .../bitwarden/BitwardenAppComponentFactory.kt |  9 -----
 .../bitwarden/BitwardenLegacyAppComponents.kt | 33 +++++++++++++++++++
 .../AccessibilityActivityManagerImpl.kt       | 10 +-----
 3 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/java/com/x8bit/bitwarden/BitwardenLegacyAppComponents.kt

diff --git a/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt b/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt
index 0aa64e73d..fc4cdc89f 100644
--- a/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt
@@ -13,15 +13,6 @@ import com.x8bit.bitwarden.data.tiles.BitwardenAutofillTileService
 import com.x8bit.bitwarden.data.tiles.BitwardenGeneratorTileService
 import com.x8bit.bitwarden.data.tiles.BitwardenVaultTileService
 
-private const val LEGACY_ACCESSIBILITY_SERVICE_NAME =
-    "com.x8bit.bitwarden.Accessibility.AccessibilityService"
-private const val LEGACY_AUTOFILL_SERVICE_NAME = "com.x8bit.bitwarden.Autofill.AutofillService"
-private const val LEGACY_CREDENTIAL_SERVICE_NAME =
-    "com.x8bit.bitwarden.Autofill.CredentialProviderService"
-private const val LEGACY_AUTOFILL_TILE_SERVICE_NAME = "com.x8bit.bitwarden.AutofillTileService"
-private const val LEGACY_VAULT_TILE_SERVICE_NAME = "com.x8bit.bitwarden.MyVaultTileService"
-private const val LEGACY_GENERATOR_TILE_SERVICE_NAME = "com.x8bit.bitwarden.GeneratorTileService"
-
 /**
  * A factory class that allows us to intercept when a manifest element is being instantiated
  * and modify various characteristics before initialization.
diff --git a/app/src/main/java/com/x8bit/bitwarden/BitwardenLegacyAppComponents.kt b/app/src/main/java/com/x8bit/bitwarden/BitwardenLegacyAppComponents.kt
new file mode 100644
index 000000000..5c9f11275
--- /dev/null
+++ b/app/src/main/java/com/x8bit/bitwarden/BitwardenLegacyAppComponents.kt
@@ -0,0 +1,33 @@
+package com.x8bit.bitwarden
+
+/**
+ * The legacy name for the accessibility service.
+ */
+const val LEGACY_ACCESSIBILITY_SERVICE_NAME: String =
+    "com.x8bit.bitwarden.Accessibility.AccessibilityService"
+
+/**
+ * The legacy name for the autofill service.
+ */
+const val LEGACY_AUTOFILL_SERVICE_NAME: String = "com.x8bit.bitwarden.Autofill.AutofillService"
+
+/**
+ * The legacy name for the accessibility autofill tile service.
+ */
+const val LEGACY_AUTOFILL_TILE_SERVICE_NAME: String = "com.x8bit.bitwarden.AutofillTileService"
+
+/**
+ * The legacy name for the credential service.
+ */
+const val LEGACY_CREDENTIAL_SERVICE_NAME: String =
+    "com.x8bit.bitwarden.Autofill.CredentialProviderService"
+
+/**
+ * The legacy name for the generator tile service.
+ */
+const val LEGACY_GENERATOR_TILE_SERVICE_NAME: String = "com.x8bit.bitwarden.GeneratorTileService"
+
+/**
+ * The legacy name for the vault tile service.
+ */
+const val LEGACY_VAULT_TILE_SERVICE_NAME: String = "com.x8bit.bitwarden.MyVaultTileService"
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/manager/AccessibilityActivityManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/manager/AccessibilityActivityManagerImpl.kt
index e5e5f82e9..9c0128d5a 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/manager/AccessibilityActivityManagerImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/manager/AccessibilityActivityManagerImpl.kt
@@ -3,19 +3,11 @@ package com.x8bit.bitwarden.data.autofill.accessibility.manager
 import android.content.Context
 import android.provider.Settings
 import androidx.lifecycle.LifecycleCoroutineScope
+import com.x8bit.bitwarden.LEGACY_ACCESSIBILITY_SERVICE_NAME
 import com.x8bit.bitwarden.data.platform.manager.AppForegroundManager
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
-/**
- * The accessibility service name as it is known in the AndroidManifest.
- *
- * Note: This is not the name of the actual service but the name defined in the Android Manifest
- * which matches the service in the Xamarin app.
- */
-private const val LEGACY_ACCESSIBILITY_SERVICE_NAME =
-    "com.x8bit.bitwarden.Accessibility.AccessibilityService"
-
 /**
  * The default implementation of the [AccessibilityActivityManager].
  */