moparisthebest
/
Conversations
mirror of https://github.com/moparisthebest/Conversations
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed enter is send option

This commit is contained in:
iNPUTmice 2015-03-06 22:22:50 +01:00
parent 44028a547f
commit cbca92d209
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -1012,8 +1012,13 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
}
@Override
public void onEnterPressed() {
sendMessage();
public boolean onEnterPressed() {
if (activity.enterIsSend()) {
sendMessage();
return true;
} else {
return false;
}
}
@Override

7
src/main/java/eu/siacs/conversations/ui/EditMessage.java
View File

@ -37,10 +37,9 @@ public class EditMessage extends EditText {
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_ENTER) {
if (keyboardListener != null) {
keyboardListener.onEnterPressed();
if (keyboardListener != null && keyboardListener.onEnterPressed()) {
return true;
}
return true;
}
return super.onKeyDown(keyCode, event);
}
@ -70,7 +69,7 @@ public class EditMessage extends EditText {
}
public interface KeyboardListener {
public void onEnterPressed();
public boolean onEnterPressed();
public void onTypingStarted();
public void onTypingStopped();
public void onTextDeleted();