Reformat project

[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 13fb63d4fcab30c15390aa5c2486c5f7d6f3bfaa..076a86db4f138d6ba353e39a36b36a208220a7ec 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -4,8 +4,11 @@ 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 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 java.util.Locale;
 
@@ -13,15 +16,13 @@ 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);
+        subparser.addArgument("number").help("Specify the phone number, for which to set the trust.").required(true);
         MutuallyExclusiveGroup 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("-v", "--verified-fingerprint")
-                .help("Specify the fingerprint of the key, only use this option if you have verified the fingerprint.");
+        mutTrust.addArgument("-v", "--verified-safety-number", "--verified-fingerprint")
+                .help("Specify the safety number of the key, only use this option if you have verified the safety number.");
     }
 
     @Override
@@ -38,34 +39,51 @@ public class TrustCommand implements LocalCommand {
                 return 1;
             }
         } else {
-            String fingerprint = ns.getString("verified_fingerprint");
-            if (fingerprint != null) {
-                fingerprint = fingerprint.replaceAll(" ", "");
-                if (fingerprint.length() == 66) {
+            String safetyNumber = ns.getString("verified_safety_number");
+            if (safetyNumber != null) {
+                safetyNumber = safetyNumber.replaceAll(" ", "");
+                if (safetyNumber.length() == 66) {
                     byte[] fingerprintBytes;
                     try {
-                        fingerprintBytes = Hex.toByteArray(fingerprint.toLowerCase(Locale.ROOT));
+                        fingerprintBytes = Hex.toByteArray(safetyNumber.toLowerCase(Locale.ROOT));
                     } catch (Exception e) {
-                        System.err.println("Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
+                        System.err.println(
+                                "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) {
+                        ErrorUtils.handleInvalidNumberException(e);
                         return 1;
                     }
-                    boolean res = m.trustIdentityVerified(number, fingerprintBytes);
                     if (!res) {
-                        System.err.println("Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
+                        System.err.println(
+                                "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) {
+                        ErrorUtils.handleInvalidNumberException(e);
                         return 1;
                     }
-                } else if (fingerprint.length() == 60) {
-                    boolean res = m.trustIdentityVerifiedSafetyNumber(number, fingerprint);
                     if (!res) {
-                        System.err.println("Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");
+                        System.err.println(
+                                "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 {
-                    System.err.println("Fingerprint has invalid format, either specify the old hex fingerprint or the new safety number");
+                    System.err.println(
+                            "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
                     return 1;
                 }
             } else {
-                System.err.println("You need to specify the fingerprint you have verified with -v FINGERPRINT");
+                System.err.println(
+                        "You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");
                 return 1;
             }
         }