aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-09-04 19:33:31 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-09-04 19:33:31 +0200
commit1848b46195a90487a8b1d9f13b99a790ed68ac48 (patch)
tree72f16a3a46844283cf5ad6030035b22546cfdce8 /src/main
parent9baa87e5c924991ff34b74fdbbc21c07c6b22036 (diff)
invoke onEnterPressed callback only if shift is not pressed
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/EditMessage.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
index a58cf2b8..72975bb7 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditMessage.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
@@ -36,7 +36,7 @@ public class EditMessage extends EditText {
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
- if (keyCode == KeyEvent.KEYCODE_ENTER) {
+ if (keyCode == KeyEvent.KEYCODE_ENTER && !event.isShiftPressed()) {
if (keyboardListener != null && keyboardListener.onEnterPressed()) {
return true;
}