empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix issue where mentions did not propagate in message send flow.

Browse source
This commit is contained in:
Alex Hart 2021-09-29 12:00:01 -03:00 • committed by Cody Henthorne
parent 6dbbec2631
commit 4b3580d98a
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
View file

@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.mediasend.v2.review package org.thoughtcrime.securesms.mediasend.v2.review
import android.content.DialogInterface
import android.os.Bundle import android.os.Bundle
import android.view.ContextThemeWrapper import android.view.ContextThemeWrapper
import android.view.KeyEvent import android.view.KeyEvent
@ -17,7 +18,6 @@ import org.thoughtcrime.securesms.components.KeyboardEntryDialogFragment
import org.thoughtcrime.securesms.components.emoji.EmojiToggle import org.thoughtcrime.securesms.components.emoji.EmojiToggle
import org.thoughtcrime.securesms.components.emoji.MediaKeyboard import org.thoughtcrime.securesms.components.emoji.MediaKeyboard
import org.thoughtcrime.securesms.components.mention.MentionAnnotation import org.thoughtcrime.securesms.components.mention.MentionAnnotation
import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher
import org.thoughtcrime.securesms.conversation.ui.mentions.MentionsPickerFragment import org.thoughtcrime.securesms.conversation.ui.mentions.MentionsPickerFragment
import org.thoughtcrime.securesms.conversation.ui.mentions.MentionsPickerViewModel import org.thoughtcrime.securesms.conversation.ui.mentions.MentionsPickerViewModel
import org.thoughtcrime.securesms.keyboard.KeyboardPage import org.thoughtcrime.securesms.keyboard.KeyboardPage
@ -66,11 +66,6 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
input = view.findViewById(R.id.add_a_message_input) input = view.findViewById(R.id.add_a_message_input)
input.setText(requireArguments().getCharSequence(ARG_INITIAL_TEXT)) input.setText(requireArguments().getCharSequence(ARG_INITIAL_TEXT))
input.addTextChangedListener(object : SimpleTextWatcher() {
override fun onTextChanged(text: String?) {
viewModel.setMessage(text)
}
})
emojiDrawerToggle = view.findViewById(R.id.emoji_toggle) emojiDrawerToggle = view.findViewById(R.id.emoji_toggle)
emojiDrawerStub = Stub(view.findViewById(R.id.emoji_drawer_stub)) emojiDrawerStub = Stub(view.findViewById(R.id.emoji_drawer_stub))
@ -114,6 +109,11 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a
ViewUtil.hideKeyboard(requireContext(), input) ViewUtil.hideKeyboard(requireContext(), input)
} }
override fun onDismiss(dialog: DialogInterface) {
super.onDismiss(dialog)
viewModel.setMessage(input.text)
}
override fun onKeyboardHidden() { override fun onKeyboardHidden() {
if (!requestedEmojiDrawer) { if (!requestedEmojiDrawer) {
super.onKeyboardHidden() super.onKeyboardHidden()

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
View file

@ -248,7 +248,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment) {
} }
private fun presentAddMessageEntry(message: CharSequence?) { private fun presentAddMessageEntry(message: CharSequence?) {
addMessageEntry.text = message addMessageEntry.setText(message, TextView.BufferType.SPANNABLE)
} }
private fun presentImageQualityToggle(quality: SentMediaQuality) { private fun presentImageQualityToggle(quality: SentMediaQuality) {

2
app/src/main/res/layout/v2_media_review_fragment.xml
View file

@ -151,7 +151,7 @@
app:layout_constraintBottom_toTopOf="@id/button_barrier" app:layout_constraintBottom_toTopOf="@id/button_barrier"
tools:alpha="1" /> tools:alpha="1" />
<org.thoughtcrime.securesms.components.emoji.EmojiEditText <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/add_a_message_entry" android:id="@+id/add_a_message_entry"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"