Add dbus methods: deleteContact and deleteRecipient

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

diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
index 8b9f9aa5db4543ec2ac8916da2f1b3854a2a3b58..b138b4391a25d5da3d8fed3eb1de88167e2a28c7 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -3,12 +3,12 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 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.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.NotMasterDeviceException;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.NotMasterDeviceException;

+import org.asamk.signal.output.OutputWriter;

 import org.asamk.signal.util.CommandUtil;
 
 import java.io.IOException;
 import org.asamk.signal.util.CommandUtil;
 
 import java.io.IOException;


@@ -33,7 +33,7 @@ public class UpdateContactCommand implements JsonRpcLocalCommand {
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         var recipientString = ns.getString("recipient");
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         var recipientString = ns.getString("recipient");

-        var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getUsername());
+        var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());

 
         try {
             var expiration = ns.getInt("expiration");
 
         try {
             var expiration = ns.getInt("expiration");


@@ -46,7 +46,7 @@ public class UpdateContactCommand implements JsonRpcLocalCommand {
                 m.setContactName(recipient, name);
             }
         } catch (IOException e) {
                 m.setContactName(recipient, name);
             }
         } catch (IOException e) {

-            throw new IOErrorException("Update contact error: " + e.getMessage());
+            throw new IOErrorException("Update contact error: " + e.getMessage(), e);

         } catch (NotMasterDeviceException e) {
             throw new UserErrorException("This command doesn't work on linked devices.");
         }
         } catch (NotMasterDeviceException e) {
             throw new UserErrorException("This command doesn't work on linked devices.");
         }