Cleanup manager package

[signal-cli] / src / main / java / org / asamk / signal / dbus / DbusSignalControlImpl.java

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index e178ca1520fd5c468618efda6d37179ef72be74e..f80b91d6544d7c44a07ca4a6148b43614a8c5dda 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -3,11 +3,11 @@ package org.asamk.signal.dbus;
 import org.asamk.SignalControl;
 import org.asamk.signal.BaseConfig;
 import org.asamk.signal.DbusConfig;
 import org.asamk.SignalControl;
 import org.asamk.signal.BaseConfig;
 import org.asamk.signal.DbusConfig;

-import org.asamk.signal.commands.SignalCreator;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.MultiAccountManager;

 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.RegistrationManager;

-import org.asamk.signal.manager.UserAlreadyExists;
+import org.asamk.signal.manager.api.UserAlreadyExistsException;

 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.PinLockedException;


@@ -15,17 +15,18 @@ import org.freedesktop.dbus.DBusPath;
 
 import java.io.IOException;
 import java.net.URI;
 
 import java.io.IOException;
 import java.net.URI;

+import java.net.URISyntaxException;
+import java.nio.channels.OverlappingFileLockException;

 import java.util.List;
 import java.util.concurrent.TimeoutException;
 import java.util.List;
 import java.util.concurrent.TimeoutException;

-import java.util.stream.Collectors;

 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 

-    private final SignalCreator c;
+    private final MultiAccountManager c;

 
     private final String objectPath;
 
 
     private final String objectPath;
 

-    public DbusSignalControlImpl(final SignalCreator c, final String objectPath) {
+    public DbusSignalControlImpl(final MultiAccountManager c, final String objectPath) {

         this.c = c;
         this.objectPath = objectPath;
     }
         this.c = c;
         this.objectPath = objectPath;
     }


@@ -53,13 +54,15 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
     ) throws Error.Failure, Error.InvalidNumber {
         if (!Manager.isValidNumber(number, null)) {
             throw new SignalControl.Error.InvalidNumber(
     ) throws Error.Failure, Error.InvalidNumber {
         if (!Manager.isValidNumber(number, null)) {
             throw new SignalControl.Error.InvalidNumber(

-                    "Invalid username (phone number), make sure you include the country code.");
+                    "Invalid account (phone number), make sure you include the country code.");

         }
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
             registrationManager.register(voiceVerification, captcha);
         } catch (CaptchaRequiredException e) {
             String message = captcha == null ? "Captcha required for verification." : "Invalid captcha given.";
             throw new SignalControl.Error.RequiresCaptcha(message);
         }
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
             registrationManager.register(voiceVerification, captcha);
         } catch (CaptchaRequiredException e) {
             String message = captcha == null ? "Captcha required for verification." : "Invalid captcha given.";
             throw new SignalControl.Error.RequiresCaptcha(message);

+        } catch (OverlappingFileLockException e) {
+            throw new SignalControl.Error.Failure("Account is already in use");

         } catch (IOException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
         }
         } catch (IOException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
         }


@@ -75,32 +78,60 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
             final String number, final String verificationCode, final String pin
     ) throws Error.Failure, Error.InvalidNumber {
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
             final String number, final String verificationCode, final String pin
     ) throws Error.Failure, Error.InvalidNumber {
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {

-            final Manager manager = registrationManager.verifyAccount(verificationCode, pin);
-            c.addManager(manager);
-        } catch (IOException | PinLockedException | IncorrectPinException e) {
+            registrationManager.verifyAccount(verificationCode, pin);
+        } catch (OverlappingFileLockException e) {
+            throw new SignalControl.Error.Failure("Account is already in use");
+        } catch (IOException e) {

             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());

+        } catch (PinLockedException e) {
+            throw new Error.Failure(
+                    "Verification failed! This number is locked with a pin. Hours remaining until reset: "
+                            + (e.getTimeRemaining() / 1000 / 60 / 60));
+        } catch (IncorrectPinException e) {
+            throw new Error.Failure("Verification failed! Invalid pin, tries remaining: " + e.getTriesRemaining());

         }
     }
 
     @Override
     public String link(final String newDeviceName) throws Error.Failure {
         try {
         }
     }
 
     @Override
     public String link(final String newDeviceName) throws Error.Failure {
         try {

-            final ProvisioningManager provisioningManager = c.getNewProvisioningManager();
-            final URI deviceLinkUri = provisioningManager.getDeviceLinkUri();
-            new Thread(() -> {
+            final URI deviceLinkUri = c.getNewProvisioningDeviceLinkUri();
+            final var thread = new Thread(() -> {
+                final ProvisioningManager provisioningManager = c.getProvisioningManagerFor(deviceLinkUri);

                 try {
                 try {

-                    final Manager manager = provisioningManager.finishDeviceLink(newDeviceName);
-                    c.addManager(manager);
-                } catch (IOException | TimeoutException | UserAlreadyExists e) {
+                    provisioningManager.finishDeviceLink(newDeviceName);
+                } catch (IOException | TimeoutException | UserAlreadyExistsException e) {

                     e.printStackTrace();
                 }
                     e.printStackTrace();
                 }

-            }).start();
+            });
+            thread.setName("dbus-link");
+            thread.start();
+            return deviceLinkUri.toString();
+        } catch (TimeoutException | IOException e) {
+            throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
+        }
+    }
+
+    @Override
+    public String startLink() throws Error.Failure {
+        try {
+            final URI deviceLinkUri = c.getNewProvisioningDeviceLinkUri();

             return deviceLinkUri.toString();
         } catch (TimeoutException | IOException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
         }
     }
 
             return deviceLinkUri.toString();
         } catch (TimeoutException | IOException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
         }
     }
 

+    @Override
+    public String finishLink(String deviceLinkUri, final String newDeviceName) throws Error.Failure {
+        try {
+            final var provisioningManager = c.getProvisioningManagerFor(new URI(deviceLinkUri));
+            return provisioningManager.finishDeviceLink(newDeviceName);
+        } catch (TimeoutException | IOException | UserAlreadyExistsException | URISyntaxException e) {
+            throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
+        }
+    }
+

     @Override
     public String version() {
         return BaseConfig.PROJECT_VERSION;
     @Override
     public String version() {
         return BaseConfig.PROJECT_VERSION;


@@ -108,9 +139,11 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
     @Override
     public List<DBusPath> listAccounts() {
 
     @Override
     public List<DBusPath> listAccounts() {

-        return c.getAccountNumbers()
-                .stream()
-                .map(u -> new DBusPath(DbusConfig.getObjectPath(u)))
-                .collect(Collectors.toList());
+        return c.getAccountNumbers().stream().map(u -> new DBusPath(DbusConfig.getObjectPath(u))).toList();
+    }
+
+    @Override
+    public DBusPath getAccount(final String number) {
+        return new DBusPath(DbusConfig.getObjectPath(number));

     }
 }
     }
 }