From 3d6c02c27c998aaf359ecffb221a775b9018197a Mon Sep 17 00:00:00 2001
From: sbkaf <sbkaf@gmx.net>
Date: Mon, 6 Nov 2017 17:38:32 +0100
Subject: [PATCH] send message on ctrl + enter
---
.../briar/android/view/TextInputView.java | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
index bf83a61dcc..06bd583e69 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
@@ -28,6 +28,7 @@ import javax.annotation.Nullable;
import static android.content.Context.INPUT_METHOD_SERVICE;
import static android.content.Context.LAYOUT_INFLATER_SERVICE;
import static android.view.KeyEvent.KEYCODE_BACK;
+import static android.view.KeyEvent.KEYCODE_ENTER;
import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
@UiThread
@@ -82,16 +83,22 @@ public class TextInputView extends KeyboardAwareLinearLayout
hideEmojiDrawer();
return true;
}
- return false;
- });
- ui.sendButton.setOnClickListener(v -> {
- if (listener != null) {
- listener.onSendClick(ui.editText.getText().toString());
+ if (keyCode == KEYCODE_ENTER && event.isCtrlPressed()) {
+ trySendMessage();
+ return true;
}
+ return false;
});
+ ui.sendButton.setOnClickListener(v -> trySendMessage());
ui.emojiDrawer.setEmojiEventListener(this);
}
+ private void trySendMessage() {
+ if (listener != null) {
+ listener.onSendClick(ui.editText.getText().toString());
+ }
+ }
+
@Override
public void setVisibility(int visibility) {
if (visibility == GONE && isKeyboardOpen()) {
--
GitLab