Refactor register and verify

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

diff --git a/src/main/java/org/asamk/signal/commands/SetPinCommand.java b/src/main/java/org/asamk/signal/commands/SetPinCommand.java
index de4e28eca29a85bc2769912b540bebe9ced7e0e2..ac601b3b11a7797c465cd4a7aebd51af7db2dfd8 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.java
@@ -2,8 +2,10 @@ 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.manager.Manager;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.libsignal.util.guava.Optional;

+import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;

 
 import java.io.IOException;
 
 
 import java.io.IOException;
 


@@ -17,15 +19,11 @@ public class SetPinCommand implements LocalCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {

-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }

         try {
             String registrationLockPin = ns.getString("registrationLockPin");
             m.setRegistrationLockPin(Optional.of(registrationLockPin));
             return 0;
         try {
             String registrationLockPin = ns.getString("registrationLockPin");
             m.setRegistrationLockPin(Optional.of(registrationLockPin));
             return 0;

-        } catch (IOException e) {
+        } catch (IOException | UnauthenticatedResponseException e) {

             System.err.println("Set pin error: " + e.getMessage());
             return 3;
         }
             System.err.println("Set pin error: " + e.getMessage());
             return 3;
         }