Refactor register and verify

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

diff --git a/src/main/java/org/asamk/signal/commands/VerifyCommand.java b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
index b6ad100bf0b4a83f0e0aaa65dd7a9c05291fd0ad..7fa10b6aaab8c768274845b1357588d24eb890df 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/VerifyCommand.java
+++ b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
@@ -3,12 +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.manager.Manager;
+import org.asamk.signal.manager.RegistrationManager;
+import org.whispersystems.signalservice.api.KeyBackupServicePinException;
+import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException;

 import org.whispersystems.signalservice.internal.push.LockedException;
 
 import java.io.IOException;
 
 import org.whispersystems.signalservice.internal.push.LockedException;
 
 import java.io.IOException;
 

-public class VerifyCommand implements LocalCommand {
+public class VerifyCommand implements RegistrationCommand {

 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {


@@ -17,11 +19,7 @@ public class VerifyCommand implements LocalCommand {
     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (m.isRegistered()) {
-            System.err.println("User registration is already verified");
-            return 1;
-        }
+    public int handleCommand(final Namespace ns, final RegistrationManager m) {

         try {
             String verificationCode = ns.getString("verificationCode");
             String pin = ns.getString("pin");
         try {
             String verificationCode = ns.getString("verificationCode");
             String pin = ns.getString("pin");


@@ -31,6 +29,12 @@ public class VerifyCommand implements LocalCommand {
             System.err.println("Verification failed! This number is locked with a pin. Hours remaining until reset: "
                     + (e.getTimeRemaining() / 1000 / 60 / 60));
             System.err.println("Use '--pin PIN_CODE' to specify the registration lock PIN");
             System.err.println("Verification failed! This number is locked with a pin. Hours remaining until reset: "
                     + (e.getTimeRemaining() / 1000 / 60 / 60));
             System.err.println("Use '--pin PIN_CODE' to specify the registration lock PIN");

+            return 1;
+        } catch (KeyBackupServicePinException e) {
+            System.err.println("Verification failed! Invalid pin, tries remaining: " + e.getTriesRemaining());
+            return 1;
+        } catch (KeyBackupSystemNoDataException e) {
+            System.err.println("Verification failed! No KBS data.");

             return 3;
         } catch (IOException e) {
             System.err.println("Verify error: " + e.getMessage());
             return 3;
         } catch (IOException e) {
             System.err.println("Verify error: " + e.getMessage());