sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into development

This commit is contained in:
Daniel Gultsch 2015-05-20 08:25:42 +02:00
parent 201bc158bd 8064832dca
commit 70ebe35ffe
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -44,8 +44,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 21 targetSdkVersion 21
versionCode 66 versionCode 67
versionName "1.4.0" versionName "1.4.1"
} }
compileOptions { compileOptions {

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

@ -285,12 +285,11 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
private Message selectedMessage; private Message selectedMessage;
private void sendMessage() { private void sendMessage() {
if (this.conversation == null) { final String body = mEditMessage.getText().toString();
if (body.length() == 0 || this.conversation == null) {
return; return;
} }
Message message = new Message(conversation, mEditMessage.getText() Message message = new Message(conversation, body, conversation.getNextEncryption(activity.forceEncryption()));
.toString(), conversation.getNextEncryption(activity
.forceEncryption()));
if (conversation.getMode() == Conversation.MODE_MULTI) { if (conversation.getMode() == Conversation.MODE_MULTI) {
if (conversation.getNextCounterpart() != null) { if (conversation.getNextCounterpart() != null) {
message.setCounterpart(conversation.getNextCounterpart()); message.setCounterpart(conversation.getNextCounterpart());