Store uuids in identity and session store

[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 f2744545414b59d2e2b1f56ef8b0a3101f96cd86..a507e2657290d946234683ad4e219ea4943bd384 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -6,7 +6,9 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;
 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.asamk.signal.util.Hex;

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

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


@@ -50,13 +52,25 @@ public class TrustCommand implements LocalCommand {
                         System.err.println("Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
                         return 1;
                     }
                         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;
                     }
                 } else if (fingerprint.length() == 60) {
                     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);
+                    boolean res;
+                    try {
+                        res = m.trustIdentityVerifiedSafetyNumber(number, fingerprint);
+                    } 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;
                     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;