Always include profile key in direct messages

[signal-cli] / src / main / java / org / asamk / signal / manager / Manager.java

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 23e37eef32274bfcc4581586eda7ba631a5b4ad0..426ee8855a190e2e754ccc9ac6b77fbb00ba6e66 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -1342,16 +1342,12 @@ public class Manager implements Closeable {
                 }
             } else {
                 // Send to all individually, so sync messages are sent correctly
                 }
             } else {
                 // Send to all individually, so sync messages are sent correctly

+                messageBuilder.withProfileKey(account.getProfileKey().serialize());

                 List<SendMessageResult> results = new ArrayList<>(recipients.size());
                 for (SignalServiceAddress address : recipients) {
                 List<SendMessageResult> results = new ArrayList<>(recipients.size());
                 for (SignalServiceAddress address : recipients) {

-                    ContactInfo contact = account.getContactStore().getContact(address);
-                    if (contact != null) {
-                        messageBuilder.withExpiration(contact.messageExpirationTime);
-                        messageBuilder.withProfileKey(account.getProfileKey().serialize());
-                    } else {
-                        messageBuilder.withExpiration(0);
-                        messageBuilder.withProfileKey(null);
-                    }
+                    final ContactInfo contact = account.getContactStore().getContact(address);
+                    final int expirationTime = contact != null ? contact.messageExpirationTime : 0;
+                    messageBuilder.withExpiration(expirationTime);

                     message = messageBuilder.build();
                     if (address.matches(account.getSelfAddress())) {
                         results.add(sendSelfMessage(message));
                     message = messageBuilder.build();
                     if (address.matches(account.getSelfAddress())) {
                         results.add(sendSelfMessage(message));