Wrap ignoreAttachments option in a ReceiveConfig record

[signal-cli] / src / main / java / org / asamk / signal / commands / SendContactsCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
index 0fcae322814c7787f72192985fd7bc8738a83b57..a5128937481e1554c99f9d24f7a6fa47c1a2585d 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
@@ -3,12 +3,10 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.OutputWriter;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
-import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.manager.Manager;
-import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
+import org.asamk.signal.output.OutputWriter;
 
 import java.io.IOException;
 
@@ -30,10 +28,8 @@ public class SendContactsCommand implements JsonRpcLocalCommand {
     ) throws CommandException {
         try {
             m.sendContacts();
-        } catch (UntrustedIdentityException e) {
-            throw new UntrustedKeyErrorException("SendContacts error: " + e.getMessage());
         } catch (IOException e) {
-            throw new IOErrorException("SendContacts error: " + e.getMessage());
+            throw new IOErrorException("SendContacts error: " + e.getMessage(), e);
         }
     }
 }