empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Do not drop group stories if not profile sharing with sender.

Browse source
This commit is contained in:
Alex Hart 2022-03-30 09:47:06 -03:00 • committed by Cody Henthorne
parent 76a9342afa
commit 2b15fc2966
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
View file

@ -367,7 +367,7 @@ public final class MessageContentProcessor {
} else if (content.getTypingMessage().isPresent()) {
handleTypingMessage(content, content.getTypingMessage().get(), senderRecipient);
} else if (content.getStoryMessage().isPresent()) {
handleStoryMessage(content, content.getStoryMessage().get(), senderRecipient);
handleStoryMessage(content, content.getStoryMessage().get(), senderRecipient, threadRecipient);
} else if (content.getDecryptionErrorMessage().isPresent()) {
handleRetryReceipt(content, content.getDecryptionErrorMessage().get(), senderRecipient);
} else if (content.getSenderKeyDistributionMessage().isPresent()) {
@ -1346,7 +1346,7 @@ public final class MessageContentProcessor {
messageNotifier.updateNotification(context);
}
private void handleStoryMessage(@NonNull SignalServiceContent content, @NonNull SignalServiceStoryMessage message, @NonNull Recipient senderRecipient) throws StorageFailedException {
private void handleStoryMessage(@NonNull SignalServiceContent content, @NonNull SignalServiceStoryMessage message, @NonNull Recipient senderRecipient, @NonNull Recipient threadRecipient) throws StorageFailedException {
log(content.getTimestamp(), "Story message.");
if (!Stories.isFeatureAvailable()) {
@ -1354,8 +1354,8 @@ public final class MessageContentProcessor {
return;
}
if (!(senderRecipient.isProfileSharing() || senderRecipient.isSystemContact())) {
warn(content.getTimestamp(), "Dropping story from an untrusted user.");
if (!threadRecipient.isGroup() && !(senderRecipient.isProfileSharing() || senderRecipient.isSystemContact())) {
warn(content.getTimestamp(), "Dropping non-group story from an untrusted user.");
return;
}