From ee176cbe3d570f32e919c91461bf38a420675344 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 1 Mar 2022 10:43:45 -0400 Subject: [PATCH] Never send a link preview via MMS. --- .../securesms/sharing/MultiShareSender.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java b/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java index 8940493d0..41de13869 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java @@ -90,18 +90,19 @@ public final class MultiShareSender { boolean needsSplit = !transport.isSms() && message != null && message.length() > transport.calculateCharacters(message).maxPrimaryMessageSize; - boolean isMediaMessage = !multiShareArgs.getMedia().isEmpty() || + boolean hasMmsMedia = !multiShareArgs.getMedia().isEmpty() || (multiShareArgs.getDataUri() != null && multiShareArgs.getDataUri() != Uri.EMPTY) || multiShareArgs.getStickerLocator() != null || - multiShareArgs.getLinkPreview() != null || recipient.isGroup() || - recipient.getEmail().isPresent() || - !mentions.isEmpty() || + recipient.getEmail().isPresent(); + boolean hasPushMedia = hasMmsMedia || + multiShareArgs.getLinkPreview() != null || + !mentions.isEmpty() || needsSplit; if ((recipient.isMmsGroup() || recipient.getEmail().isPresent()) && !isMmsEnabled) { results.add(new MultiShareSendResult(shareContactAndThread, MultiShareSendResult.Type.MMS_NOT_ENABLED)); - } else if (isMediaMessage) { + } else if (hasMmsMedia && transport.isSms() || hasPushMedia && !transport.isSms()) { sendMediaMessage(context, multiShareArgs, recipient, slideDeck, transport, shareContactAndThread.getThreadId(), forceSms, expiresIn, multiShareArgs.isViewOnce(), subscriptionId, mentions, shareContactAndThread.isStory()); results.add(new MultiShareSendResult(shareContactAndThread, MultiShareSendResult.Type.SUCCESS)); } else if (shareContactAndThread.isStory()) {