Reorder static final modifier

[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 35f530b0ea3c03a558d052a0f5b5e248bbdb8418..f21dd40d7e44555d193cd923d31d2778a11a456f 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -3,81 +3,39 @@ 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.CaptchaRequiredException;
+import org.asamk.signal.manager.api.IncorrectPinException;
+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.UserAlreadyExistsException;

 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.DBusPath;

-import org.whispersystems.libsignal.util.Pair;
-import org.whispersystems.signalservice.api.KeyBackupServicePinException;
-import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException;
-import org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 
 import java.io.IOException;
 import java.net.URI;
 
 import java.io.IOException;
 import java.net.URI;

-import java.util.ArrayList;
+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.function.Function;
-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 Function<Manager, Thread> newManagerRunner;
+    private static final Logger logger = LoggerFactory.getLogger(DbusSignalControlImpl.class);
+    private final MultiAccountManager c;

 
 

-    private final List<Pair<Manager, Thread>> receiveThreads = new ArrayList<>();
-    private final Object stopTrigger = new Object();

     private final String objectPath;
 
     private final String objectPath;
 

-    public DbusSignalControlImpl(
-            final SignalCreator c, final Function<Manager, Thread> newManagerRunner, final String objectPath
-    ) {
+    public DbusSignalControlImpl(final MultiAccountManager c, final String objectPath) {

         this.c = c;
         this.c = c;

-        this.newManagerRunner = newManagerRunner;

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

-    public void addManager(Manager m) {
-        var thread = newManagerRunner.apply(m);
-        if (thread == null) {
-            return;
-        }
-        synchronized (receiveThreads) {
-            receiveThreads.add(new Pair<>(m, thread));
-        }
-    }
-
-    public void run() {
-        synchronized (stopTrigger) {
-            try {
-                stopTrigger.wait();
-            } catch (InterruptedException ignored) {
-            }
-        }
-
-        synchronized (receiveThreads) {
-            for (var t : receiveThreads) {
-                t.second().interrupt();
-            }
-        }
-        while (true) {
-            final Thread thread;
-            synchronized (receiveThreads) {
-                if (receiveThreads.size() == 0) {
-                    break;
-                }
-                var pair = receiveThreads.remove(0);
-                thread = pair.second();
-            }
-            try {
-                thread.join();
-            } catch (InterruptedException ignored) {
-            }
-        }
-    }
-

     @Override
     public boolean isRemote() {
         return false;
     @Override
     public boolean isRemote() {
         return false;


@@ -99,11 +57,22 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
     public void registerWithCaptcha(
             final String number, final boolean voiceVerification, final String captcha
     ) throws Error.Failure, Error.InvalidNumber {
     public void registerWithCaptcha(
             final String number, final boolean voiceVerification, final String captcha
     ) throws Error.Failure, Error.InvalidNumber {

+        if (!Manager.isValidNumber(number, null)) {
+            throw new SignalControl.Error.InvalidNumber(
+                    "Invalid account (phone number), make sure you include the country code.");
+        }

         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
             registrationManager.register(voiceVerification, captcha);
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
             registrationManager.register(voiceVerification, captcha);

+        } catch (RateLimitException e) {
+            String message = "Rate limit reached";
+            throw new SignalControl.Error.Failure(message);

         } catch (CaptchaRequiredException e) {
             String message = captcha == null ? "Captcha required for verification." : "Invalid captcha given.";
             throw new SignalControl.Error.RequiresCaptcha(message);
         } catch (CaptchaRequiredException e) {
             String message = captcha == null ? "Captcha required for verification." : "Invalid captcha given.";
             throw new SignalControl.Error.RequiresCaptcha(message);

+        } catch (NonNormalizedPhoneNumberException e) {
+            throw new Error.InvalidNumber(e.getMessage());
+        } 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());
         }


@@ -119,32 +88,59 @@ 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);
-            addManager(manager);
-        } catch (IOException | KeyBackupSystemNoDataException | KeyBackupServicePinException 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 {
         }
     }
 
     @Override
     public String link(final String newDeviceName) throws Error.Failure {

+        final URI deviceLinkUri;

         try {
         try {

-            final ProvisioningManager provisioningManager = c.getNewProvisioningManager();
-            final URI deviceLinkUri = provisioningManager.getDeviceLinkUri();
-            new Thread(() -> {
-                try {
-                    final Manager manager = provisioningManager.finishDeviceLink(newDeviceName);
-                    addManager(manager);
-                } catch (IOException | TimeoutException | UserAlreadyExists e) {
-                    e.printStackTrace();
-                }
-            }).start();
+            deviceLinkUri = c.getNewProvisioningDeviceLinkUri();
+        } catch (TimeoutException | IOException e) {
+            throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
+        }
+        Thread.ofPlatform().name("dbus-link").start(() -> {
+            final ProvisioningManager provisioningManager = c.getProvisioningManagerFor(deviceLinkUri);
+            try {
+                provisioningManager.finishDeviceLink(newDeviceName);
+            } catch (IOException | TimeoutException | UserAlreadyExistsException e) {
+                logger.warn("Failed to finish linking", e);
+            }
+        });
+        return deviceLinkUri.toString();
+    }
+
+    @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;


@@ -152,12 +148,11 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
     @Override
     public List<DBusPath> listAccounts() {
 
     @Override
     public List<DBusPath> listAccounts() {

-        synchronized (receiveThreads) {
-            return receiveThreads.stream()
-                    .map(Pair::first)
-                    .map(Manager::getUsername)
-                    .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));

     }
 }
     }
 }