Provide IntentManager from compositionLocal (#630)

app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt

@@ -67,7 +67,6 @@ import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.Ter
 import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountEvent.NavigateToPrivacyPolicy
 import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountEvent.NavigateToTerms
 import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
-import com.x8bit.bitwarden.ui.platform.base.util.IntentHandler
 import com.x8bit.bitwarden.ui.platform.base.util.asText
 import com.x8bit.bitwarden.ui.platform.components.BitwardenBasicDialog
 import com.x8bit.bitwarden.ui.platform.components.BitwardenLoadingDialog
@@ -79,6 +78,8 @@ import com.x8bit.bitwarden.ui.platform.components.BitwardenTextField
 import com.x8bit.bitwarden.ui.platform.components.BitwardenTopAppBar
 import com.x8bit.bitwarden.ui.platform.components.BitwardenTwoButtonDialog
 import com.x8bit.bitwarden.ui.platform.components.LoadingDialogState
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
+import com.x8bit.bitwarden.ui.platform.theme.LocalIntentManager
 import com.x8bit.bitwarden.ui.platform.theme.clickableSpanStyle
 
 /**
@@ -90,7 +91,7 @@ import com.x8bit.bitwarden.ui.platform.theme.clickableSpanStyle
 fun CreateAccountScreen(
     onNavigateBack: () -> Unit,
     onNavigateToLogin: (emailAddress: String, captchaToken: String) -> Unit,
-    intentHandler: IntentHandler = IntentHandler(context = LocalContext.current),
+    intentManager: IntentManager = LocalIntentManager.current,
     viewModel: CreateAccountViewModel = hiltViewModel(),
 ) {
     val state by viewModel.stateFlow.collectAsState()
@@ -98,11 +99,11 @@ fun CreateAccountScreen(
     EventsEffect(viewModel) { event ->
         when (event) {
             is NavigateToPrivacyPolicy -> {
-                intentHandler.launchUri("https://bitwarden.com/privacy/".toUri())
+                intentManager.launchUri("https://bitwarden.com/privacy/".toUri())
             }
 
             is NavigateToTerms -> {
-                intentHandler.launchUri("https://bitwarden.com/terms/".toUri())
+                intentManager.launchUri("https://bitwarden.com/terms/".toUri())
             }
 
             is CreateAccountEvent.NavigateBack -> onNavigateBack.invoke()
@@ -111,7 +112,7 @@ fun CreateAccountScreen(
             }
 
             is CreateAccountEvent.NavigateToCaptcha -> {
-                intentHandler.startCustomTabsActivity(uri = event.uri)
+                intentManager.startCustomTabsActivity(uri = event.uri)
             }
 
             is CreateAccountEvent.NavigateToLogin -> {

app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt

@@ -39,7 +39,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
-import com.x8bit.bitwarden.ui.platform.base.util.IntentHandler
 import com.x8bit.bitwarden.ui.platform.components.BitwardenAccountSwitcher
 import com.x8bit.bitwarden.ui.platform.components.BitwardenBasicDialog
 import com.x8bit.bitwarden.ui.platform.components.BitwardenClickableText
@@ -52,6 +51,8 @@ import com.x8bit.bitwarden.ui.platform.components.BitwardenPlaceholderAccountAct
 import com.x8bit.bitwarden.ui.platform.components.BitwardenScaffold
 import com.x8bit.bitwarden.ui.platform.components.BitwardenTopAppBar
 import com.x8bit.bitwarden.ui.platform.components.OverflowMenuItemData
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
+import com.x8bit.bitwarden.ui.platform.theme.LocalIntentManager
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 
@@ -66,7 +67,7 @@ fun LoginScreen(
     onNavigateToEnterpriseSignOn: () -> Unit,
     onNavigateToLoginWithDevice: () -> Unit,
     viewModel: LoginViewModel = hiltViewModel(),
-    intentHandler: IntentHandler = IntentHandler(context = LocalContext.current),
+    intentManager: IntentManager = LocalIntentManager.current,
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
     val context = LocalContext.current
@@ -74,7 +75,7 @@ fun LoginScreen(
         when (event) {
             LoginEvent.NavigateBack -> onNavigateBack()
             is LoginEvent.NavigateToCaptcha -> {
-                intentHandler.startCustomTabsActivity(uri = event.uri)
+                intentManager.startCustomTabsActivity(uri = event.uri)
             }
 
             LoginEvent.NavigateToEnterpriseSignOn -> onNavigateToEnterpriseSignOn()

app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutScreen.kt

@@ -41,14 +41,15 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
-import com.x8bit.bitwarden.ui.platform.base.util.IntentHandler
 import com.x8bit.bitwarden.ui.platform.base.util.Text
 import com.x8bit.bitwarden.ui.platform.base.util.asText
 import com.x8bit.bitwarden.ui.platform.components.BitwardenExternalLinkRow
 import com.x8bit.bitwarden.ui.platform.components.BitwardenScaffold
 import com.x8bit.bitwarden.ui.platform.components.BitwardenTopAppBar
 import com.x8bit.bitwarden.ui.platform.components.BitwardenWideSwitch
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
 import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
+import com.x8bit.bitwarden.ui.platform.theme.LocalIntentManager
 
 /**
  * Displays the about screen.
@@ -59,7 +60,7 @@ import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
 fun AboutScreen(
     onNavigateBack: () -> Unit,
     viewModel: AboutViewModel = hiltViewModel(),
-    intentHandler: IntentHandler = IntentHandler(context = LocalContext.current),
+    intentManager: IntentManager = LocalIntentManager.current,
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
     val context = LocalContext.current
@@ -69,15 +70,15 @@ fun AboutScreen(
             AboutEvent.NavigateBack -> onNavigateBack.invoke()
 
             AboutEvent.NavigateToHelpCenter -> {
-                intentHandler.launchUri("https://bitwarden.com/help".toUri())
+                intentManager.launchUri("https://bitwarden.com/help".toUri())
             }
 
             AboutEvent.NavigateToLearnAboutOrganizations -> {
-                intentHandler.launchUri("https://bitwarden.com/help/about-organizations".toUri())
+                intentManager.launchUri("https://bitwarden.com/help/about-organizations".toUri())
             }
 
             AboutEvent.NavigateToWebVault -> {
-                intentHandler.launchUri("https://vault.bitwarden.com".toUri())
+                intentManager.launchUri("https://vault.bitwarden.com".toUri())
             }
 
             is AboutEvent.ShowToast -> {

app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt

@@ -34,7 +34,6 @@ import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout
 import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction
 import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
-import com.x8bit.bitwarden.ui.platform.base.util.IntentHandler
 import com.x8bit.bitwarden.ui.platform.base.util.Text
 import com.x8bit.bitwarden.ui.platform.components.BitwardenExternalLinkRow
 import com.x8bit.bitwarden.ui.platform.components.BitwardenListHeaderText
@@ -48,6 +47,8 @@ import com.x8bit.bitwarden.ui.platform.components.BitwardenTopAppBar
 import com.x8bit.bitwarden.ui.platform.components.BitwardenTwoButtonDialog
 import com.x8bit.bitwarden.ui.platform.components.BitwardenWideSwitch
 import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenTimePickerDialog
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
+import com.x8bit.bitwarden.ui.platform.theme.LocalIntentManager
 import com.x8bit.bitwarden.ui.platform.theme.LocalNonMaterialColors
 import com.x8bit.bitwarden.ui.platform.theme.LocalNonMaterialTypography
 import com.x8bit.bitwarden.ui.platform.util.displayLabel
@@ -66,7 +67,7 @@ fun AccountSecurityScreen(
     onNavigateBack: () -> Unit,
     onNavigateToDeleteAccount: () -> Unit,
     viewModel: AccountSecurityViewModel = hiltViewModel(),
-    intentHandler: IntentHandler = IntentHandler(context = LocalContext.current),
+    intentManager: IntentManager = LocalIntentManager.current,
 ) {
     val state by viewModel.stateFlow.collectAsState()
     val context = LocalContext.current
@@ -78,7 +79,7 @@ fun AccountSecurityScreen(
             AccountSecurityEvent.NavigateToDeleteAccount -> onNavigateToDeleteAccount()
 
             AccountSecurityEvent.NavigateToFingerprintPhrase -> {
-                intentHandler.launchUri("http://bitwarden.com/help/fingerprint-phrase".toUri())
+                intentManager.launchUri("http://bitwarden.com/help/fingerprint-phrase".toUri())
             }
 
             is AccountSecurityEvent.ShowToast -> {

app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManager.kt

@@ -0,0 +1,35 @@
+package com.x8bit.bitwarden.ui.platform.manager.intent
+
+import android.content.Intent
+import android.net.Uri
+
+/**
+ * A manager class for simplifying the handling of Android Intents within a given context.
+ */
+interface IntentManager {
+
+    /**
+     * Starts an intent to exit the application.
+     */
+    fun exitApplication()
+
+    /**
+     * Start an activity using the provided [Intent].
+     */
+    fun startActivity(intent: Intent)
+
+    /**
+     * Start a Custom Tabs Activity using the provided [Uri].
+     */
+    fun startCustomTabsActivity(uri: Uri)
+
+    /**
+     * Start an activity to view the given [uri] in an external browser.
+     */
+    fun launchUri(uri: Uri)
+
+    /**
+     * Launches the share sheet with the given [text].
+     */
+    fun shareText(text: String)
+}

app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt

@@ -1,4 +1,4 @@
-package com.x8bit.bitwarden.ui.platform.base.util
+package com.x8bit.bitwarden.ui.platform.manager.intent
 
 import android.content.Context
 import android.content.Intent
@@ -7,15 +7,15 @@ import androidx.browser.customtabs.CustomTabsIntent
 import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
 
 /**
- * A utility class for simplifying the handling of Android Intents within a given context.
+ * The default implementation of the [IntentManager] for simplifying the handling of Android
+ * Intents within a given context.
  */
 @OmitFromCoverage
-class IntentHandler(private val context: Context) {
+class IntentManagerImpl(
+    private val context: Context,
+) : IntentManager {
 
-    /**
-     * Starts an intent to exit the application.
-     */
-    fun exitApplication() {
+    override fun exitApplication() {
         // Note that we fire an explicit Intent rather than try to cast to an Activity and call
         // finish to avoid assumptions about what kind of context we have.
         val intent = Intent(Intent.ACTION_MAIN).apply {
@@ -24,27 +24,18 @@ class IntentHandler(private val context: Context) {
         startActivity(intent)
     }
 
-    /**
-     * Start an activity using the provided [Intent].
-     */
-    fun startActivity(intent: Intent) {
+    override fun startActivity(intent: Intent) {
         context.startActivity(intent)
     }
 
-    /**
-     * Start a Custom Tabs Activity using the provided [Uri].
-     */
-    fun startCustomTabsActivity(uri: Uri) {
+    override fun startCustomTabsActivity(uri: Uri) {
         CustomTabsIntent
             .Builder()
             .build()
             .launchUrl(context, uri)
     }
 
-    /**
-     * Start an activity to view the given [uri] in an external browser.
-     */
-    fun launchUri(uri: Uri) {
+    override fun launchUri(uri: Uri) {
         val newUri = if (uri.scheme == null) {
             uri.buildUpon().scheme("https").build()
         } else {
@@ -53,10 +44,7 @@ class IntentHandler(private val context: Context) {
         startActivity(Intent(Intent.ACTION_VIEW, newUri))
     }
 
-    /**
-     * Launches the share sheet with the given [text].
-     */
-    fun shareText(text: String) {
+    override fun shareText(text: String) {
         val sendIntent: Intent = Intent(Intent.ACTION_SEND).apply {
             putExtra(Intent.EXTRA_TEXT, text)
             type = "text/plain"

app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/BitwardenTheme.kt

@@ -22,6 +22,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
 import com.x8bit.bitwarden.R
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManagerImpl
 import com.x8bit.bitwarden.ui.platform.manager.permissions.PermissionsManager
 import com.x8bit.bitwarden.ui.platform.manager.permissions.PermissionsManagerImpl
 
@@ -69,6 +71,7 @@ fun BitwardenTheme(
         LocalNonMaterialColors provides nonMaterialColors,
         LocalNonMaterialTypography provides nonMaterialTypography,
         LocalPermissionsManager provides PermissionsManagerImpl(context as Activity),
+        LocalIntentManager provides IntentManagerImpl(context),
     ) {
         // Set overall theme based on color scheme and typography settings
         MaterialTheme(
@@ -156,7 +159,14 @@ private fun Int.toColor(context: Context): Color =
     Color(context.getColor(this))
 
 /**
- * Provides access to non material theme typography throughout the app.
+ * Provides access to the intent manager throughout the app.
+ */
+val LocalIntentManager: ProvidableCompositionLocal<IntentManager> = compositionLocalOf {
+    error("CompositionLocal LocalIntentManager not present")
+}
+
+/**
+ * Provides access to the permission manager throughout the app.
  */
 val LocalPermissionsManager: ProvidableCompositionLocal<PermissionsManager> = compositionLocalOf {
     error("CompositionLocal LocalPermissionsManager not present")

app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendScreen.kt

@@ -28,7 +28,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
-import com.x8bit.bitwarden.ui.platform.base.util.IntentHandler
 import com.x8bit.bitwarden.ui.platform.components.BasicDialogState
 import com.x8bit.bitwarden.ui.platform.components.BitwardenBasicDialog
 import com.x8bit.bitwarden.ui.platform.components.BitwardenErrorContent
@@ -40,6 +39,8 @@ import com.x8bit.bitwarden.ui.platform.components.BitwardenScaffold
 import com.x8bit.bitwarden.ui.platform.components.BitwardenSearchActionItem
 import com.x8bit.bitwarden.ui.platform.components.LoadingDialogState
 import com.x8bit.bitwarden.ui.platform.components.OverflowMenuItemData
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
+import com.x8bit.bitwarden.ui.platform.theme.LocalIntentManager
 import com.x8bit.bitwarden.ui.tools.feature.send.handlers.SendHandlers
 import kotlinx.collections.immutable.persistentListOf
 
@@ -53,7 +54,7 @@ fun SendScreen(
     onNavigateToAddSend: () -> Unit,
     onNavigateToEditSend: (sendItemId: String) -> Unit,
     viewModel: SendViewModel = hiltViewModel(),
-    intentHandler: IntentHandler = IntentHandler(context = LocalContext.current),
+    intentManager: IntentManager = LocalIntentManager.current,
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
     val context = LocalContext.current
@@ -74,11 +75,11 @@ fun SendScreen(
             is SendEvent.NavigateToEditSend -> onNavigateToEditSend(event.sendId)
 
             is SendEvent.NavigateToAboutSend -> {
-                intentHandler.launchUri("https://bitwarden.com/products/send".toUri())
+                intentManager.launchUri("https://bitwarden.com/products/send".toUri())
             }
 
             is SendEvent.ShowShareSheet -> {
-                intentHandler.shareText(event.url)
+                intentManager.shareText(event.url)
             }
 
             is SendEvent.ShowToast -> {

app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreen.kt

@@ -22,7 +22,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
-import com.x8bit.bitwarden.ui.platform.base.util.IntentHandler
 import com.x8bit.bitwarden.ui.platform.components.BasicDialogState
 import com.x8bit.bitwarden.ui.platform.components.BitwardenBasicDialog
 import com.x8bit.bitwarden.ui.platform.components.BitwardenErrorContent
@@ -35,6 +34,8 @@ import com.x8bit.bitwarden.ui.platform.components.BitwardenTopAppBar
 import com.x8bit.bitwarden.ui.platform.components.BitwardenTwoButtonDialog
 import com.x8bit.bitwarden.ui.platform.components.LoadingDialogState
 import com.x8bit.bitwarden.ui.platform.components.OverflowMenuItemData
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
+import com.x8bit.bitwarden.ui.platform.theme.LocalIntentManager
 import com.x8bit.bitwarden.ui.platform.util.persistentListOfNotNull
 import com.x8bit.bitwarden.ui.tools.feature.send.addsend.handlers.AddSendHandlers
 
@@ -46,7 +47,7 @@ import com.x8bit.bitwarden.ui.tools.feature.send.addsend.handlers.AddSendHandler
 @Composable
 fun AddSendScreen(
     viewModel: AddSendViewModel = hiltViewModel(),
-    intentHandler: IntentHandler = IntentHandler(LocalContext.current),
+    intentManager: IntentManager = LocalIntentManager.current,
     onNavigateBack: () -> Unit,
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
@@ -58,7 +59,7 @@ fun AddSendScreen(
         when (event) {
             is AddSendEvent.NavigateBack -> onNavigateBack()
             is AddSendEvent.ShowShareSheet -> {
-                intentHandler.shareText(event.message)
+                intentManager.shareText(event.message)
             }
 
             is AddSendEvent.ShowToast -> {

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt

@@ -27,7 +27,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
-import com.x8bit.bitwarden.ui.platform.base.util.IntentHandler
 import com.x8bit.bitwarden.ui.platform.base.util.asText
 import com.x8bit.bitwarden.ui.platform.components.BasicDialogState
 import com.x8bit.bitwarden.ui.platform.components.BitwardenBasicDialog
@@ -40,6 +39,8 @@ import com.x8bit.bitwarden.ui.platform.components.BitwardenScaffold
 import com.x8bit.bitwarden.ui.platform.components.BitwardenTopAppBar
 import com.x8bit.bitwarden.ui.platform.components.LoadingDialogState
 import com.x8bit.bitwarden.ui.platform.components.OverflowMenuItemData
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
+import com.x8bit.bitwarden.ui.platform.theme.LocalIntentManager
 import com.x8bit.bitwarden.ui.vault.feature.item.handlers.VaultCardItemTypeHandlers
 import com.x8bit.bitwarden.ui.vault.feature.item.handlers.VaultCommonItemTypeHandlers
 import com.x8bit.bitwarden.ui.vault.feature.item.handlers.VaultLoginItemTypeHandlers
@@ -53,7 +54,7 @@ import kotlinx.collections.immutable.persistentListOf
 @Composable
 fun VaultItemScreen(
     viewModel: VaultItemViewModel = hiltViewModel(),
-    intentHandler: IntentHandler = IntentHandler(context = LocalContext.current),
+    intentManager: IntentManager = LocalIntentManager.current,
     onNavigateBack: () -> Unit,
     onNavigateToVaultAddEditItem: (vaultItemId: String) -> Unit,
     onNavigateToMoveToOrganization: (vaultItemId: String) -> Unit,
@@ -75,7 +76,7 @@ fun VaultItemScreen(
                 Toast.makeText(context, "Not yet implemented.", Toast.LENGTH_SHORT).show()
             }
 
-            is VaultItemEvent.NavigateToUri -> intentHandler.launchUri(event.uri.toUri())
+            is VaultItemEvent.NavigateToUri -> intentManager.launchUri(event.uri.toUri())
 
             is VaultItemEvent.NavigateToAttachments -> {
                 // TODO implement attachments in BIT-522

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/manualcodeentry/ManualCodeEntryScreen.kt

@@ -32,14 +32,15 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
-import com.x8bit.bitwarden.ui.platform.base.util.IntentHandler
 import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
 import com.x8bit.bitwarden.ui.platform.components.BitwardenFilledTonalButton
 import com.x8bit.bitwarden.ui.platform.components.BitwardenScaffold
 import com.x8bit.bitwarden.ui.platform.components.BitwardenTextField
 import com.x8bit.bitwarden.ui.platform.components.BitwardenTopAppBar
 import com.x8bit.bitwarden.ui.platform.components.BitwardenTwoButtonDialog
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
 import com.x8bit.bitwarden.ui.platform.manager.permissions.PermissionsManager
+import com.x8bit.bitwarden.ui.platform.theme.LocalIntentManager
 import com.x8bit.bitwarden.ui.platform.theme.LocalPermissionsManager
 
 /**
@@ -52,7 +53,7 @@ fun ManualCodeEntryScreen(
     onNavigateBack: () -> Unit,
     onNavigateToQrCodeScreen: () -> Unit,
     viewModel: ManualCodeEntryViewModel = hiltViewModel(),
-    intentHandler: IntentHandler = IntentHandler(LocalContext.current),
+    intentManager: IntentManager = LocalIntentManager.current,
     permissionsManager: PermissionsManager = LocalPermissionsManager.current,
 ) {
     var shouldShowPermissionDialog by rememberSaveable { mutableStateOf(false) }
@@ -74,7 +75,7 @@ fun ManualCodeEntryScreen(
                 val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
                 intent.data = Uri.parse("package:" + context.packageName)
 
-                intentHandler.startActivity(intent = intent)
+                intentManager.startActivity(intent = intent)
             }
 
             is ManualCodeEntryEvent.ShowToast -> {

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt

@@ -35,7 +35,6 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
-import com.x8bit.bitwarden.ui.platform.base.util.IntentHandler
 import com.x8bit.bitwarden.ui.platform.base.util.asText
 import com.x8bit.bitwarden.ui.platform.base.util.showNotYetImplementedToast
 import com.x8bit.bitwarden.ui.platform.components.BasicDialogState
@@ -53,6 +52,8 @@ import com.x8bit.bitwarden.ui.platform.components.BitwardenTwoButtonDialog
 import com.x8bit.bitwarden.ui.platform.components.LoadingDialogState
 import com.x8bit.bitwarden.ui.platform.components.OverflowMenuItemData
 import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary
+import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
+import com.x8bit.bitwarden.ui.platform.theme.LocalIntentManager
 import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType
 import com.x8bit.bitwarden.ui.vault.model.VaultItemListingType
 import kotlinx.collections.immutable.persistentListOf
@@ -71,7 +72,7 @@ fun VaultScreen(
     onNavigateToVaultEditItemScreen: (vaultItemId: String) -> Unit,
     onNavigateToVaultItemListingScreen: (vaultItemType: VaultItemListingType) -> Unit,
     onDimBottomNavBarRequest: (shouldDim: Boolean) -> Unit,
-    intentHandler: IntentHandler = IntentHandler(LocalContext.current),
+    intentManager: IntentManager = LocalIntentManager.current,
 ) {
     val state by viewModel.stateFlow.collectAsState()
     val context = LocalContext.current
@@ -107,7 +108,7 @@ fun VaultScreen(
                 onNavigateToVaultItemListingScreen(event.itemListingType)
             }
 
-            VaultEvent.NavigateOutOfApp -> intentHandler.exitApplication()
+            VaultEvent.NavigateOutOfApp -> intentManager.exitApplication()
             is VaultEvent.ShowToast -> {
                 Toast
                     .makeText(context, event.message(context.resources), Toast.LENGTH_SHORT)