Improve output for profile key update messages

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index 67a3361384557928f3baa74d866cd339d9997e70..d2164e91a96960db35f3ba333122bccb6e2e8c94 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -100,6 +100,7 @@ public record MessageEnvelope(
             boolean isExpirationUpdate,
             boolean isViewOnce,
             boolean isEndSession,
             boolean isExpirationUpdate,
             boolean isViewOnce,
             boolean isEndSession,

+            boolean isProfileKeyUpdate,

             boolean hasProfileKey,
             Optional<Reaction> reaction,
             Optional<Quote> quote,
             boolean hasProfileKey,
             Optional<Reaction> reaction,
             Optional<Quote> quote,


@@ -126,6 +127,7 @@ public record MessageEnvelope(
                     dataMessage.isExpirationUpdate(),
                     dataMessage.isViewOnce(),
                     dataMessage.isEndSession(),
                     dataMessage.isExpirationUpdate(),
                     dataMessage.isViewOnce(),
                     dataMessage.isEndSession(),

+                    dataMessage.isProfileKeyUpdate(),

                     dataMessage.getProfileKey().isPresent(),
                     dataMessage.getReaction().map(r -> Reaction.from(r, recipientResolver, addressResolver)),
                     dataMessage.getQuote().map(q -> Quote.from(q, recipientResolver, addressResolver, fileProvider)),
                     dataMessage.getProfileKey().isPresent(),
                     dataMessage.getReaction().map(r -> Reaction.from(r, recipientResolver, addressResolver)),
                     dataMessage.getQuote().map(q -> Quote.from(q, recipientResolver, addressResolver, fileProvider)),

diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index 04a7be030c8edc220c13a0ba8e8f9c5dedb7873b..390087f9d37b4254fc88d136da71549a2508d174 100644 (file)
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -141,9 +141,12 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (message.expiresInSeconds() > 0) {
             writer.println("Expires in: {} seconds", message.expiresInSeconds());
         }
         if (message.expiresInSeconds() > 0) {
             writer.println("Expires in: {} seconds", message.expiresInSeconds());
         }

-        if (message.hasProfileKey()) {
+        if (message.isProfileKeyUpdate()) {

             writer.println("Profile key update");
         }
             writer.println("Profile key update");
         }

+        if (message.hasProfileKey()) {
+            writer.println("With profile key");
+        }

         if (message.reaction().isPresent()) {
             writer.println("Reaction:");
             final var reaction = message.reaction().get();
         if (message.reaction().isPresent()) {
             writer.println("Reaction:");
             final var reaction = message.reaction().get();

diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 9ffb0795343bca9e8a38120cfa25984ae0aee64e..901531474d085c0c7980f02dd93e1151b44c38cf 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -757,6 +757,7 @@ public class DbusManagerImpl implements Manager {
                                 false,
                                 false,
                                 false,
                                 false,
                                 false,
                                 false,

+                                false,

                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),


@@ -827,6 +828,7 @@ public class DbusManagerImpl implements Manager {
                                         false,
                                         false,
                                         false,
                                         false,
                                         false,
                                         false,

+                                        false,

                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),