From 5612a5d9e41e9661db2533f895b06b128e6ac1fe Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 4 Apr 2022 12:49:44 -0300
Subject: [PATCH] Fix issue where all forwarded MMS media would try to send as
 a secure message.

---
 .../securesms/sharing/MultiShareSender.java       | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 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 f51de2c9a..9812f3a1d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
@@ -11,6 +11,7 @@ import androidx.core.util.Consumer;
 import com.annimon.stream.Stream;
 
 import org.signal.core.util.ThreadUtil;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.TransportOption;
 import org.thoughtcrime.securesms.TransportOptions;
@@ -33,7 +34,6 @@ import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 import org.thoughtcrime.securesms.util.MessageUtil;
 import org.thoughtcrime.securesms.util.Util;
-import org.signal.core.util.concurrent.SimpleTask;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -252,13 +252,14 @@ public final class MultiShareSender {
       outgoingMessages.add(outgoingMediaMessage);
     }
 
-    if (recipient.isRegistered() && !forceSms) {
+    if (shouldSendAsPush(recipient, forceSms))
+    {
       for (final OutgoingMediaMessage outgoingMessage : outgoingMessages) {
         MessageSender.send(context, new OutgoingSecureMediaMessage(outgoingMessage), threadId, false, null, null);
       }
     } else {
       for (final OutgoingMediaMessage outgoingMessage : outgoingMessages) {
-        MessageSender.send(context, new OutgoingSecureMediaMessage(outgoingMessage), threadId, forceSms, null, null);
+        MessageSender.send(context, outgoingMessage, threadId, forceSms, null, null);
       }
     }
   }
@@ -273,7 +274,7 @@ public final class MultiShareSender {
   {
 
     final OutgoingTextMessage outgoingTextMessage;
-    if (recipient.isRegistered() && !forceSms) {
+    if (shouldSendAsPush(recipient, forceSms)) {
       outgoingTextMessage = new OutgoingEncryptedMessage(recipient, multiShareArgs.getDraftText(), expiresIn);
     } else {
       outgoingTextMessage = new OutgoingTextMessage(recipient, multiShareArgs.getDraftText(), expiresIn, subscriptionId);
@@ -282,6 +283,12 @@ public final class MultiShareSender {
     MessageSender.send(context, outgoingTextMessage, threadId, forceSms, null, null);
   }
 
+  private static boolean shouldSendAsPush(@NonNull Recipient recipient, boolean forceSms) {
+    return recipient.isDistributionList() ||
+           recipient.isServiceIdOnly()    ||
+           (recipient.isRegistered() && !forceSms);
+  }
+
   private static @NonNull SlideDeck buildSlideDeck(@NonNull Context context, @NonNull MultiShareArgs multiShareArgs) throws SlideNotFoundException {
     SlideDeck slideDeck = new SlideDeck();
     if (multiShareArgs.getStickerLocator() != null) {