From 76ead3f344a8d25ec763e0f8e7ab32e82660aaf3 Mon Sep 17 00:00:00 2001 From: Jorge Martin Espinosa Date: Mon, 31 Oct 2022 16:16:42 +0100 Subject: [PATCH] Fix new line and enter key presses deleting existing text in some keyboards (#7437) --- changelog.d/7357.bugfix | 1 + .../home/room/detail/composer/MessageComposerFragment.kt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog.d/7357.bugfix diff --git a/changelog.d/7357.bugfix b/changelog.d/7357.bugfix new file mode 100644 index 0000000000..697c92b31e --- /dev/null +++ b/changelog.d/7357.bugfix @@ -0,0 +1 @@ +New line and Enter hardware key presses deleting existing text in some keyboards. diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt index d3b323966f..2bbd5c3474 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt @@ -294,11 +294,11 @@ class MessageComposerFragment : VectorBaseFragment(), A !keyEvent.isShiftPressed && keyEvent.keyCode == KeyEvent.KEYCODE_ENTER && resources.configuration.keyboard != Configuration.KEYBOARD_NOKEYS - val result = if (isSendAction || externalKeyboardPressedEnter) { + val sendMessageWithEnter = externalKeyboardPressedEnter && vectorPreferences.sendMessageWithEnter() + val result = if (isSendAction || sendMessageWithEnter) { sendTextMessage(v.text) true } else false - composer.setTextIfDifferent(null) result }