Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with story thread when processing a sync message.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-10-05 11:52:57 -04:00
committed by GitHub
parent ee00e931eb
commit ad1801108d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
View File

@@ -1641,6 +1641,10 @@ public final class MessageContentProcessor {
Recipient threadRecipient = Objects.requireNonNull(SignalDatabase.threads().getRecipientForThreadId(story.getThreadId())); Recipient threadRecipient = Objects.requireNonNull(SignalDatabase.threads().getRecipientForThreadId(story.getThreadId()));
boolean groupStory = threadRecipient.isActiveGroup(); boolean groupStory = threadRecipient.isActiveGroup();
if (!groupStory) {
threadRecipient = senderRecipient;
}
handlePossibleExpirationUpdate(content, message, threadRecipient.getGroupId(), senderRecipient, threadRecipient, receivedTime); handlePossibleExpirationUpdate(content, message, threadRecipient.getGroupId(), senderRecipient, threadRecipient, receivedTime);
if (message.getGroupContext().isPresent() ) { if (message.getGroupContext().isPresent() ) {
@@ -1935,7 +1939,7 @@ public final class MessageContentProcessor {
} }
quoteModel = new QuoteModel(storyContext.getSentTimestamp(), storyAuthorRecipient, quoteBody, false, story.getSlideDeck().asAttachments(), Collections.emptyList(), QuoteModel.Type.NORMAL); quoteModel = new QuoteModel(storyContext.getSentTimestamp(), storyAuthorRecipient, quoteBody, false, story.getSlideDeck().asAttachments(), Collections.emptyList(), QuoteModel.Type.NORMAL);
expiresInMillis = TimeUnit.SECONDS.toMillis(message.getExpirationStartTimestamp()); expiresInMillis = TimeUnit.SECONDS.toMillis(message.getDataMessage().get().getExpiresInSeconds());
} else { } else {
warn(envelopeTimestamp, "Story has replies disabled. Dropping reply."); warn(envelopeTimestamp, "Story has replies disabled. Dropping reply.");
return -1L; return -1L;