Fix bug where sticky SMS setting wasn't respected.

Fixes #8783
This commit is contained in:
Greyson Parrelli 2019-04-28 11:34:56 -07:00
parent ae6ef62160
commit c0982293bf

View File

@ -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;