From 4fcbf4704dc6ee6a624764bc187cc8507c6502a6 Mon Sep 17 00:00:00 2001 From: David Perez Date: Wed, 24 Jan 2024 17:01:31 -0600 Subject: [PATCH] Rename launchActivityForResult to getActivityResultLauncher (#764) --- .../x8bit/bitwarden/ui/platform/manager/intent/IntentManager.kt | 2 +- .../bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt | 2 +- .../bitwarden/ui/tools/feature/send/addsend/AddSendScreen.kt | 2 +- .../bitwarden/ui/vault/feature/attachments/AttachmentsScreen.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManager.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManager.kt index 70d18dee7c..12f271325f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManager.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManager.kt @@ -42,7 +42,7 @@ interface IntentManager { * retrieving the [ActivityResult]. */ @Composable - fun launchActivityForResult( + fun getActivityResultLauncher( onResult: (ActivityResult) -> Unit, ): ManagedActivityResultLauncher diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt index 91eb7d7dc1..7d9f213d57 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt @@ -56,7 +56,7 @@ class IntentManagerImpl( } @Composable - override fun launchActivityForResult( + override fun getActivityResultLauncher( onResult: (ActivityResult) -> Unit, ): ManagedActivityResultLauncher = rememberLauncherForActivityResult( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreen.kt index f4cd594dff..a97b20055f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreen.kt @@ -64,7 +64,7 @@ fun AddSendScreen( val context = LocalContext.current val resources = context.resources - val fileChooserLauncher = intentManager.launchActivityForResult { activityResult -> + val fileChooserLauncher = intentManager.getActivityResultLauncher { activityResult -> intentManager.getFileDataFromActivityResult(activityResult)?.let { addSendHandlers.onFileChoose(it) } diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsScreen.kt index 8862239964..824e52cee0 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsScreen.kt @@ -41,7 +41,7 @@ fun AttachmentsScreen( ) { val state by viewModel.stateFlow.collectAsStateWithLifecycle() val attachmentsHandlers = remember(viewModel) { AttachmentsHandlers.create(viewModel) } - val fileChooserLauncher = intentManager.launchActivityForResult { activityResult -> + val fileChooserLauncher = intentManager.getActivityResultLauncher { activityResult -> intentManager.getFileDataFromActivityResult(activityResult)?.let { attachmentsHandlers.onFileChoose(it) }