From 002e881704ebb5c128f9f4aa5727759ac7f111bc Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 17 Feb 2020 17:26:19 +0100 Subject: [PATCH] Fix multiple share intent issue --- .../features/share/IncomingShareFragment.kt | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareFragment.kt b/vector/src/main/java/im/vector/riotx/features/share/IncomingShareFragment.kt index 1ba00ad50c..eb0f5128ba 100644 --- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/share/IncomingShareFragment.kt @@ -76,17 +76,19 @@ class IncomingShareFragment @Inject constructor( attachmentsHelper = AttachmentsHelper.create(this, this).register() val intent = vectorBaseActivity.intent - if (intent?.action == Intent.ACTION_SEND || intent?.action == Intent.ACTION_SEND_MULTIPLE) { - var isShareManaged = attachmentsHelper.handleShareIntent( - IntentUtils.getPickerIntentForSharing(intent) - ) - if (!isShareManaged) { - isShareManaged = handleTextShare(intent) + val isShareManaged = when (intent?.action) { + Intent.ACTION_SEND -> { + var isShareManaged = attachmentsHelper.handleShareIntent(IntentUtils.getPickerIntentForSharing(intent)) + if (!isShareManaged) { + isShareManaged = handleTextShare(intent) + } + isShareManaged } - if (!isShareManaged) { - cannotManageShare(R.string.error_handling_incoming_share) - } - } else { + Intent.ACTION_SEND_MULTIPLE -> attachmentsHelper.handleShareIntent(intent) + else -> false + } + + if (!isShareManaged) { cannotManageShare(R.string.error_handling_incoming_share) }