Fix issue where SMS were sometimes sent as MMS.

Fixes #8664

src/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -2044,17 +2044,19 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         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, "forceSms: " + forceSms);