From: AsamK <asamk@gmx.de>
Date: Sat, 18 Jun 2022 10:11:36 +0000 (+0200)
Subject: Improve output for profile key update messages
X-Git-Tag: v0.10.9~16
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/abebffb2cd99678bd17498fea2d1f0749b602c8b?ds=sidebyside

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 67a33613..d2164e91 100644
--- 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 isProfileKeyUpdate,
             boolean hasProfileKey,
             Optional<Reaction> reaction,
             Optional<Quote> quote,
@@ -126,6 +127,7 @@ public record MessageEnvelope(
                     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)),
diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index 04a7be03..390087f9 100644
--- 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.hasProfileKey()) {
+        if (message.isProfileKeyUpdate()) {
             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();
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 9ffb0795..90153147 100644
--- 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,
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),
@@ -827,6 +828,7 @@ public class DbusManagerImpl implements Manager {
                                         false,
                                         false,
                                         false,
+                                        false,
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),