Add CommandException to abstract cli return codes for errors

[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 58c7371fd322be498544e49111308c85b1104bd4..08fe6a41e30b4dd0bebbbb1c17cb91fc4722286b 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -1,12 +1,12 @@
 package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.impl.Arguments;
 package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.impl.Arguments;

-import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;

 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.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UserErrorException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.util.ErrorUtils;

 import org.asamk.signal.util.Hex;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import org.asamk.signal.util.Hex;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 


@@ -17,7 +17,7 @@ public class TrustCommand implements LocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("number").help("Specify the phone number, for which to set the trust.").required(true);
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("number").help("Specify the phone number, for which to set the trust.").required(true);

-        MutuallyExclusiveGroup mutTrust = subparser.addMutuallyExclusiveGroup();
+        var mutTrust = subparser.addMutuallyExclusiveGroup();

         mutTrust.addArgument("-a", "--trust-all-known-keys")
                 .help("Trust all known keys of this user, only use this for testing.")
                 .action(Arguments.storeTrue());
         mutTrust.addArgument("-a", "--trust-all-known-keys")
                 .help("Trust all known keys of this user, only use this for testing.")
                 .action(Arguments.storeTrue());


@@ -26,16 +26,15 @@ public class TrustCommand implements LocalCommand {
     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        String number = ns.getString("number");
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+        var number = ns.getString("number");

         if (ns.getBoolean("trust_all_known_keys")) {
         if (ns.getBoolean("trust_all_known_keys")) {

-            boolean res = m.trustIdentityAllKeys(number);
+            var res = m.trustIdentityAllKeys(number);

             if (!res) {
             if (!res) {

-                System.err.println("Failed to set the trust for this number, make sure the number is correct.");
-                return 1;
+                throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");

             }
         } else {
             }
         } else {

-            String safetyNumber = ns.getString("verified_safety_number");
+            var safetyNumber = ns.getString("verified_safety_number");

             if (safetyNumber != null) {
                 safetyNumber = safetyNumber.replaceAll(" ", "");
                 if (safetyNumber.length() == 66) {
             if (safetyNumber != null) {
                 safetyNumber = safetyNumber.replaceAll(" ", "");
                 if (safetyNumber.length() == 66) {


@@ -43,46 +42,38 @@ public class TrustCommand implements LocalCommand {
                     try {
                         fingerprintBytes = Hex.toByteArray(safetyNumber.toLowerCase(Locale.ROOT));
                     } catch (Exception e) {
                     try {
                         fingerprintBytes = Hex.toByteArray(safetyNumber.toLowerCase(Locale.ROOT));
                     } catch (Exception e) {

-                        System.err.println(
+                        throw new UserErrorException(

                                 "Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
                                 "Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");

-                        return 1;

                     }
                     boolean res;
                     try {
                         res = m.trustIdentityVerified(number, fingerprintBytes);
                     } catch (InvalidNumberException e) {
                     }
                     boolean res;
                     try {
                         res = m.trustIdentityVerified(number, fingerprintBytes);
                     } catch (InvalidNumberException e) {

-                        ErrorUtils.handleInvalidNumberException(e);
-                        return 1;
+                        throw new UserErrorException("Failed to parse recipient: " + e.getMessage());

                     }
                     if (!res) {
                     }
                     if (!res) {

-                        System.err.println(
+                        throw new UserErrorException(

                                 "Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
                                 "Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");

-                        return 1;

                     }
                 } else if (safetyNumber.length() == 60) {
                     boolean res;
                     try {
                         res = m.trustIdentityVerifiedSafetyNumber(number, safetyNumber);
                     } catch (InvalidNumberException e) {
                     }
                 } else if (safetyNumber.length() == 60) {
                     boolean res;
                     try {
                         res = m.trustIdentityVerifiedSafetyNumber(number, safetyNumber);
                     } catch (InvalidNumberException e) {

-                        ErrorUtils.handleInvalidNumberException(e);
-                        return 1;
+                        throw new UserErrorException("Failed to parse recipient: " + e.getMessage());

                     }
                     if (!res) {
                     }
                     if (!res) {

-                        System.err.println(
+                        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.");
                                 "Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");

-                        return 1;

                     }
                 } else {
                     }
                 } else {

-                    System.err.println(
+                    throw new UserErrorException(

                             "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
                             "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");

-                    return 1;

                 }
             } else {
                 }
             } else {

-                System.err.println(
+                throw new UserErrorException(

                         "You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");
                         "You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");

-                return 1;

             }
         }
             }
         }

-        return 0;

     }
 }
     }
 }