Fix getUserStatus command with only username parameter

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

diff --git a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
index d173ee636781235e5fb5274518519b5e72609111..8085bc65801985d285e2be5c88532a5eb4d51f4a 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
@@ -3,10 +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.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.Manager;

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

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


@@ -31,6 +33,8 @@ public class RemovePinCommand implements JsonRpcLocalCommand {
             m.setRegistrationLockPin(Optional.empty());
         } catch (IOException e) {
             throw new IOErrorException("Remove pin error: " + e.getMessage(), e);
             m.setRegistrationLockPin(Optional.empty());
         } catch (IOException e) {
             throw new IOErrorException("Remove pin error: " + e.getMessage(), e);

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

         }
     }
 }
         }
     }
 }