mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Improve timer event generation from GV2 sync messages.

main
Greyson Parrelli 2023-01-20 17:58:17 -05:00
rodzic 73b453b0d4
commit 269a2e2990
1 zmienionych plików z 13 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
Wyświetl plik

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