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 5a1df1b7d..74f8a1761 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java @@ -3173,6 +3173,12 @@ public final class MessageContentProcessor { return groupRecord.isPresent() && groupRecord.get().isAnnouncementGroup() && !groupRecord.get().getAdmins().contains(sender); } } + } else if (content.getStoryMessage().isPresent()) { + if (conversation.isGroup() && conversation.isBlocked()) { + return true; + } else { + return sender.isBlocked(); + } } return false; diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt index 40c581e95..f365f86e1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt @@ -49,7 +49,7 @@ class StoriesLandingRepository(context: Context) { mapping[myStories] = list + it } - if (!recipient.isDistributionList) { + if (!recipient.isDistributionList && !recipient.isBlocked) { val list = mapping[recipient] ?: emptyList() mapping[recipient] = list + it }