From 91a9363d20ff901e99d37d7028c8cfb3ceb5ffab Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 1 Dec 2018 17:35:56 +0100
Subject: [PATCH] remove separate sendTextMessage function

---
 .../securesms/ConversationActivity.java       | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 863cb4626..bd112cc1b 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -1058,11 +1058,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   private void sendMessage() {
     try {
-      if (attachmentManager.isAttachmentPresent() || inputPanel.getQuote().isPresent()) {
-        sendMediaMessage(getMessage(), attachmentManager.buildSlideDeck());
-      } else {
-        sendTextMessage();
-      }
+      sendMediaMessage(getMessage(),
+          attachmentManager.isAttachmentPresent() || inputPanel.getQuote().isPresent()?
+            attachmentManager.buildSlideDeck() : null);
     } catch (InvalidMessageException ex) {
       Toast.makeText(ConversationActivity.this, R.string.ConversationActivity_message_is_empty_exclamation,
           Toast.LENGTH_SHORT).show();
@@ -1070,15 +1068,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
-  private void sendTextMessage()
-      throws InvalidMessageException
-  {
-    final String  messageBody = getMessage();
-    dcContext.sendTextMsg(dcChat.getId(), messageBody);
-    composeText.setText("");
-    sendComplete(dcChat.getId());
-  }
-
   private ListenableFuture<Void> sendMediaMessage(String body, SlideDeck slideDeck) {
 
     final SettableFuture<Void> future  = new SettableFuture<>();
@@ -1087,6 +1076,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     composeText.setText("");
 
+    if(slideDeck!=null) {
       inputPanel.clearQuote();
       attachmentManager.clear(glideRequests, false);
 
@@ -1115,6 +1105,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       catch(Exception e) {
         e.printStackTrace();
       }
+    }
+    else {
+      msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
+    }
 
     if(msg!=null) {
       msg.setText(body);