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 issue where SMS were sometimes sent as MMS.

Browse Source 
Fixes #8664
This commit is contained in:
Greyson Parrelli 2019-03-06 08:12:00 -08:00
parent 5ccf84f7a2
commit 1efb92b913
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2044,17 +2044,19 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
throw new RecipientFormattingException("Badly formatted"); throw new RecipientFormattingException("Badly formatted");
} }
String message = getMessage(); String message = getMessage();
boolean forceSms = sendButton.isManualSelection() && sendButton.getSelectedTransport().isSms(); TransportOption transport = sendButton.getSelectedTransport();
int subscriptionId = sendButton.getSelectedTransport().getSimSubscriptionId().or(-1); boolean forceSms = sendButton.isManualSelection() && transport.isSms();
long expiresIn = recipient.getExpireMessages() * 1000L; int subscriptionId = sendButton.getSelectedTransport().getSimSubscriptionId().or(-1);
boolean initiating = threadId == -1; long expiresIn = recipient.getExpireMessages() * 1000L;
boolean isMediaMessage = attachmentManager.isAttachmentPresent() || boolean initiating = threadId == -1;
recipient.isGroupRecipient() || boolean needsSplit = !transport.isSms() && message.length() > transport.calculateCharacters(message).maxPrimaryMessageSize;
recipient.getAddress().isEmail() || boolean isMediaMessage = attachmentManager.isAttachmentPresent() ||
inputPanel.getQuote().isPresent() || recipient.isGroupRecipient() ||
linkPreviewViewModel.hasLinkPreview() || recipient.getAddress().isEmail() ||
message.length() > sendButton.getSelectedTransport().calculateCharacters(message).maxPrimaryMessageSize; inputPanel.getQuote().isPresent() ||
linkPreviewViewModel.hasLinkPreview() ||
needsSplit;
Log.i(TAG, "isManual Selection: " + sendButton.isManualSelection()); Log.i(TAG, "isManual Selection: " + sendButton.isManualSelection());
Log.i(TAG, "forceSms: " + forceSms); Log.i(TAG, "forceSms: " + forceSms);