From 5140353722e0972bfdf6a8a6dca602927e5f93e8 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 28 Jul 2022 17:27:12 -0400 Subject: [PATCH] Fix situation where two keyboards could be showing in media editor. Fixes #11618 --- .../mediasend/v2/review/AddMessageDialogFragment.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt index 7c15789bc..d5a1b092a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt @@ -125,6 +125,13 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a } } + override fun onKeyboardShown() { + super.onKeyboardShown() + if (emojiDrawerStub.resolved() && emojiDrawerStub.get().isShowing && !emojiDrawerStub.get().isEmojiSearchMode) { + emojiDrawerStub.get().hide(true) + } + } + override fun onDestroyView() { super.onDestroyView() disposables.dispose()