TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 09:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where sticky SMS setting wasn't respected.

Browse Source 
Fixes #8783
This commit is contained in:
Greyson Parrelli 2019-04-28 11:34:56 -07:00
parent ae6ef62160
commit c0982293bf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -2014,7 +2014,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
String message = getMessage(); String message = getMessage();
TransportOption transport = sendButton.getSelectedTransport(); 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); int subscriptionId = sendButton.getSelectedTransport().getSimSubscriptionId().or(-1);
long expiresIn = recipient.getExpireMessages() * 1000L; long expiresIn = recipient.getExpireMessages() * 1000L;
boolean initiating = threadId == -1; boolean initiating = threadId == -1;