From eb77b7d56bbc2ed768b3660dcd85d39c376bb90e Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 5 Mar 2020 09:30:55 +1100
Subject: [PATCH] Remove unneeded code

---
 src/org/thoughtcrime/securesms/sms/MessageSender.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/sms/MessageSender.java b/src/org/thoughtcrime/securesms/sms/MessageSender.java
index 7a72ac68d2..438db55116 100644
--- a/src/org/thoughtcrime/securesms/sms/MessageSender.java
+++ b/src/org/thoughtcrime/securesms/sms/MessageSender.java
@@ -284,10 +284,8 @@ public class MessageSender {
       sendLocalMediaSelf(context, messageId);
     } else if (isGroupPushSend(recipient)) {
       sendGroupPush(context, recipient, messageId, null);
-    } else if (!forceSms && isPushMediaSend(context, recipient)) {
-      sendMediaPush(context, recipient, messageId);
     } else {
-      sendMms(context, messageId);
+      sendMediaPush(context, recipient, messageId);
     }
   }
 
@@ -297,10 +295,8 @@ public class MessageSender {
   {
     if (isLocalSelfSend(context, recipient, forceSms)) {
       sendLocalTextSelf(context, messageId);
-    } else if (!forceSms && isPushTextSend(context, recipient, keyExchange)) {
-      sendTextPush(context, recipient, messageId);
     } else {
-      sendSms(context, recipient, messageId);
+      sendTextPush(context, recipient, messageId);
     }
   }