From 1222d020ad8c2d3ce5360ea35217d2cbd85596e7 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 4 Oct 2021 20:50:08 -0400
Subject: [PATCH] Fix address list for sender key messages.

---
 .../signalservice/api/SignalServiceMessageSender.java         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
index f9f9c2976b..3fb510cdd1 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
@@ -1820,6 +1820,10 @@ public class SignalServiceMessageSender {
     Set<SignalProtocolAddress>               destinations         = store.getAllAddressesWithActiveSessions(addressNames);
     Map<String, List<Integer>>               devicesByAddressName = new HashMap<>();
 
+    destinations.addAll(recipients.stream()
+                                  .map(a -> new SignalProtocolAddress(a.getIdentifier(), SignalServiceAddress.DEFAULT_DEVICE_ID))
+                                  .collect(Collectors.toList()));
+
     for (SignalProtocolAddress destination : destinations) {
       List<Integer> devices = devicesByAddressName.containsKey(destination.getName()) ? devicesByAddressName.get(destination.getName()) : new LinkedList<>();
       devices.add(destination.getDeviceId());