Move Exception classes to corresponding package

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

diff --git a/src/main/java/org/asamk/signal/commands/LinkCommand.java b/src/main/java/org/asamk/signal/commands/LinkCommand.java
index 5c7ce403a9066272d391210357f8d89f7917a017..45f59082f7fbc748b25f0529b888f7c5b3122bc0 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -2,8 +2,9 @@ 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.UserAlreadyExists;
-import org.asamk.signal.manager.Manager;
+
+import org.asamk.signal.manager.ProvisioningManager;
+import org.asamk.signal.manager.UserAlreadyExists;

 import org.whispersystems.libsignal.InvalidKeyException;
 
 import java.io.IOException;
 import org.whispersystems.libsignal.InvalidKeyException;
 
 import java.io.IOException;


@@ -11,7 +12,7 @@ import java.util.concurrent.TimeoutException;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 

-public class LinkCommand implements LocalCommand {
+public class LinkCommand implements ProvisioningCommand {

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


@@ -20,15 +21,15 @@ public class LinkCommand implements LocalCommand {
     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
+    public int handleCommand(final Namespace ns, final ProvisioningManager m) {

         String deviceName = ns.getString("name");
         if (deviceName == null) {
             deviceName = "cli";
         }
         try {
             System.out.println(m.getDeviceLinkUri());
         String deviceName = ns.getString("name");
         if (deviceName == null) {
             deviceName = "cli";
         }
         try {
             System.out.println(m.getDeviceLinkUri());

-            m.finishDeviceLink(deviceName);
-            System.out.println("Associated with: " + m.getUsername());
+            String username = m.finishDeviceLink(deviceName);
+            System.out.println("Associated with: " + username);

         } catch (TimeoutException e) {
             System.err.println("Link request timed out, please try again.");
             return 3;
         } catch (TimeoutException e) {
             System.err.println("Link request timed out, please try again.");
             return 3;