From b1f7dbefd8db96cf3cd59aaa822dfd26e335853e Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 16 Mar 2022 16:19:09 -0300
Subject: [PATCH] Drop stories from users we would normally show a message
 request for.

---
 .../securesms/messages/MessageContentProcessor.java          | 5 +++++
 1 file changed, 5 insertions(+)

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 fca8297c7d..52bbde7fc0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
@@ -1338,6 +1338,11 @@ public final class MessageContentProcessor {
       return;
     }
 
+    if (!(senderRecipient.isProfileSharing() || senderRecipient.isSystemContact())) {
+      warn(content.getTimestamp(), "Dropping story from an untrusted user.");
+      return;
+    }
+
     Optional<InsertResult> insertResult;
 
     MessageDatabase database = SignalDatabase.mms();