From 7b3fcb7798e96369df7180dd580901e241d58b2f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 18 Feb 2020 12:11:51 +0100 Subject: [PATCH] When sharing to a room save a draft to pre-fill the composer --- .../riotx/features/home/room/detail/RoomDetailFragment.kt | 7 ++++--- .../riotx/features/home/room/detail/RoomDetailViewModel.kt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt index 46d2c24853..c2eb61b3ca 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt @@ -303,13 +303,14 @@ class RoomDetailFragment @Inject constructor( if (savedInstanceState == null) { when (val sharedData = roomDetailArgs.sharedData) { is SharedData.Text -> { - roomDetailViewModel.handle(RoomDetailAction.ExitSpecialMode(composerLayout.text.toString())) + // Save a draft to set the shared text to the composer + roomDetailViewModel.handle(RoomDetailAction.SaveDraft(sharedData.text)) } is SharedData.Attachments -> { // open share edition onContentAttachmentsReady(sharedData.attachmentData) } - null -> Timber.v("No share data to process") + null -> Timber.v("No share data to process") }.exhaustive } } @@ -435,7 +436,7 @@ class RoomDetailFragment @Inject constructor( composerLayout.collapse() updateComposerText(text) - composerLayout.sendButton.setContentDescription(getString(R.string.send)) + composerLayout.sendButton.contentDescription = getString(R.string.send) } private fun renderSpecialMode(event: TimelineEvent, diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt index 78f2b9a577..1eccba7fa9 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt @@ -243,7 +243,7 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro is SendMode.REPLY -> room.saveDraft(UserDraft.REPLY(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback()) is SendMode.QUOTE -> room.saveDraft(UserDraft.QUOTE(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback()) is SendMode.EDIT -> room.saveDraft(UserDraft.EDIT(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback()) - } + }.exhaustive } }