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

Allow getMessageDestination to handle Story messages.

Browse source
This commit is contained in:
Alex Hart 2022-10-07 14:12:00 -03:00 • committed by Greyson Parrelli
parent 3de75f48cf
commit 3dd31432c8
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3011,8 +3011,13 @@ public final class MessageContentProcessor {
}
private Recipient getMessageDestination(@NonNull SignalServiceContent content) throws BadGroupIdException {
SignalServiceDataMessage message = content.getDataMessage().orElse(null);
return getGroupRecipient(message != null ? message.getGroupContext() : Optional.empty()).orElseGet(() -> Recipient.externalPush(content.getSender()));
if (content.getStoryMessage().isPresent()) {
SignalServiceStoryMessage message = content.getStoryMessage().get();
return getGroupRecipient(message.getGroupContext()).orElseGet(() -> Recipient.externalPush(content.getSender()));
} else {
SignalServiceDataMessage message = content.getDataMessage().orElse(null);
return getGroupRecipient(message != null ? message.getGroupContext() : Optional.empty()).orElseGet(() -> Recipient.externalPush(content.getSender()));
}
}
private Optional<Recipient> getGroupRecipient(Optional<SignalServiceGroupV2> message) {