From 2560f7d652fbcb5881ff0e4a2664695d902f935d Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 9 Feb 2022 11:53:51 -0500
Subject: [PATCH] Added message type to sealed sender decryption result.

---
 .../signal/libsignal/metadata/SealedSessionCipher.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/java/src/main/java/org/signal/libsignal/metadata/SealedSessionCipher.java b/java/java/src/main/java/org/signal/libsignal/metadata/SealedSessionCipher.java
index a5fa5d7f9..30d2642ec 100644
--- a/java/java/src/main/java/org/signal/libsignal/metadata/SealedSessionCipher.java
+++ b/java/java/src/main/java/org/signal/libsignal/metadata/SealedSessionCipher.java
@@ -160,6 +160,7 @@ public DecryptionResult decrypt(CertificateValidator validator, byte[] ciphertex
       return new DecryptionResult(content.getSenderCertificate().getSenderUuid(),
                                   content.getSenderCertificate().getSenderE164(),
                                   content.getSenderCertificate().getSenderDeviceId(),
+                                  content.getType(),
                                   content.getGroupId(),
                                   decrypt(content));
     } catch (InvalidMessageException e) {
@@ -212,13 +213,15 @@ public static class DecryptionResult {
     private final String           senderUuid;
     private final Optional<String> senderE164;
     private final int              deviceId;
+    private final int              messageType;
     private final Optional<byte[]> groupId;
     private final byte[]           paddedMessage;
 
-    private DecryptionResult(String senderUuid, Optional<String> senderE164, int deviceId, Optional<byte[]> groupId, byte[] paddedMessage) {
+    private DecryptionResult(String senderUuid, Optional<String> senderE164, int deviceId, int messageType, Optional<byte[]> groupId, byte[] paddedMessage) {
       this.senderUuid    = senderUuid;
       this.senderE164    = senderE164;
       this.deviceId      = deviceId;
+      this.messageType   = messageType;
       this.groupId       = groupId;
       this.paddedMessage = paddedMessage;
     }
@@ -235,6 +238,10 @@ public int getDeviceId() {
       return deviceId;
     }
 
+    public int getCiphertextMessageType() {
+      return messageType;
+    }
+
     public byte[] getPaddedMessage() {
       return paddedMessage;
     }