Move distribution message processing into the decryption phase.

This commit is contained in:
Greyson Parrelli
2021-07-14 11:06:54 -04:00
parent 2f3d04d3e8
commit 580c000bda
2 changed files with 14 additions and 10 deletions

View File

@@ -240,10 +240,6 @@ public final class MessageContentProcessor {
log(String.valueOf(content.getTimestamp()), "Beginning message processing.");
if (content.getSenderKeyDistributionMessage().isPresent()) {
handleSenderKeyDistributionMessage(content.getSender(), content.getSenderDevice(), content.getSenderKeyDistributionMessage().get());
}
if (content.getDataMessage().isPresent()) {
GroupDatabase groupDatabase = DatabaseFactory.getGroupDatabase(context);
SignalServiceDataMessage message = content.getDataMessage().get();
@@ -1660,12 +1656,6 @@ public final class MessageContentProcessor {
}
}
private void handleSenderKeyDistributionMessage(@NonNull SignalServiceAddress address, int deviceId, @NonNull SenderKeyDistributionMessage message) {
log("Processing SenderKeyDistributionMessage.");
SignalServiceMessageSender sender = ApplicationDependencies.getSignalServiceMessageSender();
sender.processSenderKeyDistributionMessage(new SignalProtocolAddress(address.getIdentifier(), deviceId), message);
}
private void handleNeedsDeliveryReceipt(@NonNull SignalServiceContent content,
@NonNull SignalServiceDataMessage message,
@NonNull MessageId messageId)