From 8a75d78ce7e9b82371b4193e5e219574c6146424 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 7 Mar 2022 10:57:09 -0400 Subject: [PATCH] Restrict text story post sends to stories only. --- .../v2/text/send/TextStoryPostSendFragment.kt | 22 ------------------- .../messages/MessageContentProcessor.java | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/send/TextStoryPostSendFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/send/TextStoryPostSendFragment.kt index d2ea628808..c2dc05ecfa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/send/TextStoryPostSendFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/send/TextStoryPostSendFragment.kt @@ -132,28 +132,6 @@ class TextStoryPostSendFragment : Fragment(R.layout.stories_send_text_post_fragm ) ) ) - - if (query.isNullOrEmpty()) { - addSection( - ContactSearchConfiguration.Section.Recents( - includeHeader = true - ) - ) - } - - addSection( - ContactSearchConfiguration.Section.Individuals( - includeHeader = true, - transportType = ContactSearchConfiguration.TransportType.PUSH, - includeSelf = true - ) - ) - - addSection( - ContactSearchConfiguration.Section.Groups( - includeHeader = true - ) - ) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java index 327eead8ee..8a512b0648 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java @@ -1320,7 +1320,7 @@ public final class MessageContentProcessor { private void handleStoryMessage(@NonNull SignalServiceContent content, @NonNull SignalServiceStoryMessage message, @NonNull Recipient senderRecipient) throws StorageFailedException { log(content.getTimestamp(), "Story message."); - if (Stories.isFeatureAvailable()) { + if (!Stories.isFeatureAvailable()) { warn(content.getTimestamp(), "Dropping unsupported story."); return; }