Change content-type check to check contains

[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 9e59ad86ce34734cd4ef74ca13d47b5969713817..618655be1e6d08fc2b91ca34869a4cdcc2e1c09b 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -4,10 +4,11 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.signal.OutputWriter;

 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.output.OutputWriter;

 import org.asamk.signal.util.CommandUtil;
 import org.asamk.signal.util.Hex;
 
 import org.asamk.signal.util.CommandUtil;
 import org.asamk.signal.util.Hex;
 


@@ -39,8 +40,13 @@ public class TrustCommand implements JsonRpcLocalCommand {
     ) throws CommandException {
         var recipentString = ns.getString("recipient");
         var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());
     ) throws CommandException {
         var recipentString = ns.getString("recipient");
         var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());

-        if (ns.getBoolean("trust-all-known-keys")) {
-            boolean res = m.trustIdentityAllKeys(recipient);
+        if (Boolean.TRUE.equals(ns.getBoolean("trust-all-known-keys"))) {
+            boolean res;
+            try {
+                res = m.trustIdentityAllKeys(recipient);
+            } 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.");
             }
             if (!res) {
                 throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");
             }


@@ -60,13 +66,23 @@ public class TrustCommand implements JsonRpcLocalCommand {
                     throw new UserErrorException(
                             "Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
                 }
                     throw new UserErrorException(
                             "Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
                 }

-                boolean res = m.trustIdentityVerified(recipient, fingerprintBytes);
+                boolean res;
+                try {
+                    res = m.trustIdentityVerified(recipient, fingerprintBytes);
+                } 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 the fingerprint of this number, make sure the number and the fingerprint are correct.");
                 }
             } else if (safetyNumber.length() == 60) {
                 if (!res) {
                     throw new UserErrorException(
                             "Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
                 }
             } else if (safetyNumber.length() == 60) {

-                boolean res = m.trustIdentityVerifiedSafetyNumber(recipient, safetyNumber);
+                boolean res;
+                try {
+                    res = m.trustIdentityVerifiedSafetyNumber(recipient, safetyNumber);
+                } 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 the safety number of this phone number, make sure the phone number and the safety number are correct.");
                 if (!res) {
                     throw new UserErrorException(
                             "Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");


@@ -79,7 +95,12 @@ public class TrustCommand implements JsonRpcLocalCommand {
                     throw new UserErrorException(
                             "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
                 }
                     throw new UserErrorException(
                             "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
                 }

-                boolean res = m.trustIdentityVerifiedSafetyNumber(recipient, scannableSafetyNumber);
+                boolean res;
+                try {
+                    res = m.trustIdentityVerifiedSafetyNumber(recipient, scannableSafetyNumber);
+                } 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 the safety number of this phone number, make sure the phone number and the safety number are correct.");
                 if (!res) {
                     throw new UserErrorException(
                             "Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");