Merge branch 'master' into development

Daniel Gultsch created 10 years ago

Change summary

build.gradle                                                      | 4 
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 7 
2 files changed, 5 insertions(+), 6 deletions(-)

Detailed changes

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 {

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());