From 67ccd14af20fae648fec5346ea85a99ace821eb4 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 6 Aug 2021 17:29:02 -0400
Subject: [PATCH] Ensure certain sender key payloads are serialized properly.

---
 .../signalservice/api/crypto/EnvelopeContent.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java
index da60c60358..7ca33859c7 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java
@@ -152,7 +152,7 @@ public interface EnvelopeContent {
 
     @Override
     public OutgoingPushMessage processUnsealedSender(SignalSessionCipher sessionCipher, SignalProtocolAddress destination) {
-      String body                 = Base64.encodeBytes(plaintextContent.getBody());
+      String body                 = Base64.encodeBytes(plaintextContent.serialize());
       int    remoteRegistrationId = sessionCipher.getRemoteRegistrationId();
 
       return new OutgoingPushMessage(Type.PLAINTEXT_CONTENT_VALUE, destination.getDeviceId(), remoteRegistrationId, body);