From 1848b46195a90487a8b1d9f13b99a790ed68ac48 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 4 Sep 2015 19:33:31 +0200 Subject: invoke onEnterPressed callback only if shift is not pressed --- src/main/java/eu/siacs/conversations/ui/EditMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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; } -- cgit v1.2.3