From 155bdf6164bbf57d5a61bdc32ec3aa2e83e0d8e0 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 2 Mar 2022 12:45:44 -0400
Subject: [PATCH] Fix storyType selection issue in forwarder.

---
 .../securesms/sharing/MultiShareSender.java        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 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 f153e7e358..bf2530e4cd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
@@ -173,13 +173,11 @@ public final class MultiShareSender {
 
     List<OutgoingMediaMessage> outgoingMessages = new ArrayList<>();
 
-    StoryType storyType = StoryType.NONE;
-    if (isStory && recipient.isDistributionList()) {
-      storyType = SignalDatabase.distributionLists().getStoryType(recipient.requireDistributionListId());
-    }
-
-    if (isStory && slideDeck.getSlides().size() > 1) {
-      if (storyType == StoryType.NONE) {
+    if (isStory) {
+      final StoryType storyType;
+      if (recipient.isDistributionList()) {
+        storyType = SignalDatabase.distributionLists().getStoryType(recipient.requireDistributionListId());
+      } else {
         storyType = StoryType.STORY_WITH_REPLIES;
       }
 
@@ -218,7 +216,7 @@ public final class MultiShareSender {
                                                                            expiresIn,
                                                                            isViewOnce,
                                                                            ThreadDatabase.DistributionTypes.DEFAULT,
-                                                                           storyType,
+                                                                           StoryType.NONE,
                                                                            null,
                                                                            null,
                                                                            Collections.emptyList(),