aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-05-20 08:25:00 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-05-20 08:25:00 +0200
commit8064832dcaf9098ed7748fbdf3e21f3f6734cd28 (patch)
tree0dc9542ee9c592a8afc75f0b030d08d6d018b016
parent4f36aa39a4e8aa5128c12a713bd9d3d4d9b51469 (diff)
don't allow user to accidentally send empty messages1.4.1
-rw-r--r--build.gradle4
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java7
2 files changed, 5 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle
index 98b341d5..d572892d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,8 +44,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 21
- versionCode 66
- versionName "1.4.0"
+ versionCode 67
+ versionName "1.4.1"
}
compileOptions {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 20fc1750..02f664db 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -285,12 +285,11 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
private Message selectedMessage;
private void sendMessage() {
- if (this.conversation == null) {
+ final String body = mEditMessage.getText().toString();
+ if (body.length() == 0 || this.conversation == null) {
return;
}
- Message message = new Message(conversation, mEditMessage.getText()
- .toString(), conversation.getNextEncryption(activity
- .forceEncryption()));
+ Message message = new Message(conversation, body, conversation.getNextEncryption(activity.forceEncryption()));
if (conversation.getMode() == Conversation.MODE_MULTI) {
if (conversation.getNextCounterpart() != null) {
message.setCounterpart(conversation.getNextCounterpart());