Update codestyle

[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..2780dc46b7a5c0bc67156d1163548475f8d3d700 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 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.manager.Manager;

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

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

+import org.whispersystems.signalservice.api.util.InvalidNumberException;

 
 import java.util.Locale;
 
 
 import java.util.Locale;
 


@@ -20,8 +23,8 @@ public class TrustCommand implements LocalCommand {
         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());

-        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
     }
 
     @Override


@@ -38,34 +41,46 @@ public class TrustCommand implements LocalCommand {
                 return 1;
             }
         } else {
                 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 {
                     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.");
                         return 1;
                     }
                     } catch (Exception e) {
                         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 = m.trustIdentityVerified(number, fingerprintBytes);
+                    boolean res;
+                    try {
+                        res = m.trustIdentityVerified(number, fingerprintBytes);
+                    } catch (InvalidNumberException e) {
+                        ErrorUtils.handleInvalidNumberException(e);
+                        return 1;
+                    }

                     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.");
                         return 1;
                     }
                     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.");
                         return 1;
                     }

-                } else if (fingerprint.length() == 60) {
-                    boolean res = m.trustIdentityVerifiedSafetyNumber(number, fingerprint);
+                } else if (safetyNumber.length() == 60) {
+                    boolean res;
+                    try {
+                        res = m.trustIdentityVerifiedSafetyNumber(number, safetyNumber);
+                    } catch (InvalidNumberException e) {
+                        ErrorUtils.handleInvalidNumberException(e);
+                        return 1;
+                    }

                     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.");
                         return 1;
                     }
                 } else {
                     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.");
                         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 {
                     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;
             }
         }
                 return 1;
             }
         }