From c0982293bfe241719532909e5a40d1a7a4118d50 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sun, 28 Apr 2019 11:34:56 -0700
Subject: [PATCH] Fix bug where sticky SMS setting wasn't respected.

Fixes #8783
---
 .../securesms/conversation/ConversationActivity.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 1abb92c4bb..f3a496eace 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -2014,7 +2014,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
       String          message        = getMessage();
       TransportOption transport      = sendButton.getSelectedTransport();
-      boolean         forceSms       = sendButton.isManualSelection() && transport.isSms();
+      boolean         forceSms       = (recipient.isForceSmsSelection() || sendButton.isManualSelection()) && transport.isSms();
       int             subscriptionId = sendButton.getSelectedTransport().getSimSubscriptionId().or(-1);
       long            expiresIn      = recipient.getExpireMessages() * 1000L;
       boolean         initiating     = threadId == -1;