From 32137dc4b0a77af7b7e40a44933fe589eca50ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 9 Nov 2015 18:43:58 -0500
Subject: [PATCH] text messages: don't send if empty
Tuleap: #123
Change-Id: I70af840996fb6f7b78a863a90de39f10eedcb7b2
---
.../java/cx/ring/client/ConversationActivity.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java b/ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java
index 1e3f315f9..b098929e9 100644
--- a/ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java
@@ -193,8 +193,11 @@ public class ConversationActivity extends AppCompatActivity {
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
switch (actionId) {
case EditorInfo.IME_ACTION_SEND:
- onSendTextMessage(msgEditTxt.getText().toString());
- msgEditTxt.setText("");
+ CharSequence txt = msgEditTxt.getText();
+ if (txt.length() > 0) {
+ onSendTextMessage(msgEditTxt.getText().toString());
+ msgEditTxt.setText("");
+ }
return true;
}
return false;
@@ -204,8 +207,11 @@ public class ConversationActivity extends AppCompatActivity {
msgSendBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- onSendTextMessage(msgEditTxt.getText().toString());
- msgEditTxt.setText("");
+ CharSequence txt = msgEditTxt.getText();
+ if (txt.length() > 0) {
+ onSendTextMessage(txt.toString());
+ msgEditTxt.setText("");
+ }
}
});
bottomPane = (ViewGroup) findViewById(R.id.ongoingcall_pane);
--
GitLab