Adapt receive subscription notification to have payload in result field

[signal-cli] / src / main / java / org / asamk / signal / commands / TrustCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java
index 7d1dd6321c2cc76e4275ab6f64688a912f4777c7..9b9735d357589400762c4a578d3f14dde47f282d 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -38,15 +38,15 @@ public class TrustCommand implements JsonRpcLocalCommand {
         var recipentString = ns.getString("recipient");
         var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());
         if (Boolean.TRUE.equals(ns.getBoolean("trust-all-known-keys"))) {
         var recipentString = ns.getString("recipient");
         var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());
         if (Boolean.TRUE.equals(ns.getBoolean("trust-all-known-keys"))) {

-            boolean res;

             try {
             try {

-                res = m.trustIdentityAllKeys(recipient);
+                final var res = m.trustIdentityAllKeys(recipient);
+                if (!res) {
+                    throw new UserErrorException(
+                            "Failed to set the trust for this number, make sure the number is correct.");
+                }

             } catch (UnregisteredRecipientException e) {
                 throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
             }
             } catch (UnregisteredRecipientException e) {
                 throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
             }

-            if (!res) {
-                throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");
-            }

         } else {
             var safetyNumber = ns.getString("verified-safety-number");
             if (safetyNumber == null) {
         } else {
             var safetyNumber = ns.getString("verified-safety-number");
             if (safetyNumber == null) {