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

Improve timer event generation from GV2 sync messages.

Browse source
This commit is contained in:
Greyson Parrelli 2023-01-20 17:58:17 -05:00
parent 73b453b0d4
commit 269a2e2990
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2002,10 +2002,17 @@ public final class MessageContentProcessor {
}
private long handleSynchronizeSentExpirationUpdate(@NonNull SentTranscriptMessage message)
throws MmsException, BadGroupIdException
throws MmsException
{
log(message.getTimestamp(), "Synchronize sent expiration update.");
Optional<GroupId> groupId = getSyncMessageDestination(message).getGroupId();
if (groupId.isPresent() && groupId.get().isV2()) {
warn(String.valueOf(message.getTimestamp()), "Expiration update received for GV2. Ignoring.");
return -1;
}
MessageTable database = SignalDatabase.messages();
Recipient recipient = getSyncMessageDestination(message);
@ -2034,9 +2041,9 @@ public final class MessageContentProcessor {
try {
Optional<SignalServiceDataMessage.Reaction> reaction = message.getDataMessage().get().getReaction();
ParentStoryId parentStoryId;
SignalServiceDataMessage.StoryContext storyContext = message.getDataMessage().get().getStoryContext().get();
MessageTable database = SignalDatabase.messages();
Recipient recipient = getSyncMessageDestination(message);
SignalServiceDataMessage.StoryContext storyContext = message.getDataMessage().get().getStoryContext().get();
MessageTable database = SignalDatabase.messages();
Recipient recipient = getSyncMessageDestination(message);
QuoteModel quoteModel = null;
long expiresInMillis = 0L;
RecipientId storyAuthorRecipient = RecipientId.from(storyContext.getAuthorServiceId());
@ -2267,8 +2274,8 @@ public final class MessageContentProcessor {
{
log(envelopeTimestamp, "Synchronize sent media message for " + message.getTimestamp());
MessageTable database = SignalDatabase.messages();
Recipient recipients = getSyncMessageDestination(message);
MessageTable database = SignalDatabase.messages();
Recipient recipients = getSyncMessageDestination(message);
Optional<QuoteModel> quote = getValidatedQuote(message.getDataMessage().get().getQuote());
Optional<Attachment> sticker = getStickerAttachment(message.getDataMessage().get().getSticker());
Optional<List<Contact>> sharedContacts = getContacts(message.getDataMessage().get().getSharedContacts());