Use SignalServiceAddress in more places

[signal-cli] / src / main / java / org / asamk / signal / util / ErrorUtils.java

diff --git a/src/main/java/org/asamk/signal/util/ErrorUtils.java b/src/main/java/org/asamk/signal/util/ErrorUtils.java
index 99fc409ae9582a18711a158537477ab60ffe5981..44d98cd2dc7d098ab7150042e1ae86507089fd66 100644 (file)
--- a/src/main/java/org/asamk/signal/util/ErrorUtils.java
+++ b/src/main/java/org/asamk/signal/util/ErrorUtils.java
@@ -8,6 +8,7 @@ import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
 import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
 import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
+import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
 
@@ -31,7 +32,7 @@ public class ErrorUtils {
             System.err.println("Unregistered user \"" + n.getE164Number() + "\": " + n.getMessage());
         }
         for (UntrustedIdentityException n : e.getUntrustedIdentityExceptions()) {
-            System.err.println("Untrusted Identity for \"" + n.getE164Number() + "\": " + n.getMessage());
+            System.err.println("Untrusted Identity for \"" + n.getIdentifier() + "\": " + n.getMessage());
         }
     }
 
@@ -59,4 +60,10 @@ public class ErrorUtils {
         System.err.println(e.getMessage());
         System.err.println("Aborting sending.");
     }
+
+    public static void handleInvalidNumberException(InvalidNumberException e) {
+        System.err.println("Failed to parse recipient: " + e.getMessage());
+        System.err.println(e.getMessage());
+        System.err.println("Aborting sending.");
+    }
 }