Remove now unnecessary SuccessExitStatus from systemd units

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

diff --git a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java
index 9ca126d059c39cb9dbc943bc10f07da8e9806e9c..d1feff8a9dc636412d1fa14d5b5513f948baa709 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java
@@ -3,14 +3,14 @@ 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.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.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.NotMasterDeviceException;
+import org.asamk.signal.manager.api.Configuration;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
+import org.asamk.signal.output.OutputWriter;

 
 

-import java.io.IOException;
+import java.util.Optional;

 
 public class UpdateConfigurationCommand implements JsonRpcLocalCommand {
 
 
 public class UpdateConfigurationCommand implements JsonRpcLocalCommand {
 


@@ -45,10 +45,11 @@ public class UpdateConfigurationCommand implements JsonRpcLocalCommand {
         final var typingIndicators = ns.getBoolean("typing-indicators");
         final var linkPreviews = ns.getBoolean("link-previews");
         try {
         final var typingIndicators = ns.getBoolean("typing-indicators");
         final var linkPreviews = ns.getBoolean("link-previews");
         try {

-            m.updateConfiguration(readReceipts, unidentifiedDeliveryIndicators, typingIndicators, linkPreviews);
-        } catch (IOException e) {
-            throw new IOErrorException("UpdateAccount error: " + e.getMessage(), e);
-        } catch (NotMasterDeviceException e) {
+            m.updateConfiguration(new Configuration(Optional.ofNullable(readReceipts),
+                    Optional.ofNullable(unidentifiedDeliveryIndicators),
+                    Optional.ofNullable(typingIndicators),
+                    Optional.ofNullable(linkPreviews)));
+        } catch (NotPrimaryDeviceException e) {

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