X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/860ec6f5dcda56b55e0e756e862c8c55865ccd19..4177deccf1e91483f54c5fcfacffce0ce525ad39:/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 99fc409a..a09be3d0 100644
--- a/src/main/java/org/asamk/signal/util/ErrorUtils.java
+++ b/src/main/java/org/asamk/signal/util/ErrorUtils.java
@@ -1,13 +1,12 @@
 package org.asamk.signal.util;
 
-import org.asamk.signal.GroupIdFormatException;
-import org.asamk.signal.GroupNotFoundException;
-import org.asamk.signal.NotAGroupMemberException;
-import org.freedesktop.dbus.exceptions.DBusExecutionException;
+import org.asamk.signal.manager.GroupNotFoundException;
+import org.asamk.signal.manager.NotAGroupMemberException;
 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 +30,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());
         }
     }
 
@@ -50,13 +49,13 @@ public class ErrorUtils {
         System.err.println("Aborting sending.");
     }
 
-    public static void handleDBusExecutionException(DBusExecutionException e) {
-        System.err.println("Cannot connect to dbus: " + e.getMessage());
-        System.err.println("Aborting.");
-    }
-
     public static void handleGroupIdFormatException(GroupIdFormatException e) {
         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("Aborting sending.");
+    }
 }