aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-05-20 08:25:42 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-05-20 08:25:42 +0200
commit70ebe35ffede6d2ce49104dbb815be3f1a396d1f (patch)
tree413780e43eb04e721aa0d3205d766a15c9d78ecd /src/main/java/eu/siacs/conversations
parent201bc158bd9fa77c1ffcea53758280bd830e5710 (diff)
parent8064832dcaf9098ed7748fbdf3e21f3f6734cd28 (diff)
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java7
1 files changed, 3 insertions, 4 deletions
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());