Update gradle

[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 aa3574449f3f1a281ccaadd1a963b7348c4bc153..50150a98710ef268c5801d12d47c2e46ed97742b 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -7,11 +7,17 @@ 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.MultiAccountManager;
 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.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;

+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.PinLockMissingException;

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

+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.UserAlreadyExistsException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;

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

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

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


@@ -22,6 +28,7 @@ import java.util.concurrent.TimeoutException;
 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 

+    private static final Logger logger = LoggerFactory.getLogger(DbusSignalControlImpl.class);

     private final MultiAccountManager c;
 
     private final String objectPath;
     private final MultiAccountManager c;
 
     private final String objectPath;


@@ -43,27 +50,35 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
     @Override
     public void register(
 
     @Override
     public void register(

-            final String number, final boolean voiceVerification
+            final String number,
+            final boolean voiceVerification

     ) throws Error.Failure, Error.InvalidNumber {
         registerWithCaptcha(number, voiceVerification, null);
     }
 
     @Override
     public void registerWithCaptcha(
     ) throws Error.Failure, Error.InvalidNumber {
         registerWithCaptcha(number, voiceVerification, null);
     }
 
     @Override
     public void registerWithCaptcha(

-            final String number, final boolean voiceVerification, final String captcha
+            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)) {
     ) 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);
+            registrationManager.register(voiceVerification, captcha, false);
+        } 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 (OverlappingFileLockException e) {
             throw new SignalControl.Error.Failure("Account is already in use");

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

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


@@ -75,33 +90,44 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
     @Override
     public void verifyWithPin(
 
     @Override
     public void verifyWithPin(

-            final String number, final String verificationCode, final String pin
+            final String number,
+            final String verificationCode,
+            final String pin

     ) throws Error.Failure, Error.InvalidNumber {
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
             registrationManager.verifyAccount(verificationCode, pin);
         } catch (OverlappingFileLockException e) {
             throw new SignalControl.Error.Failure("Account is already in use");
     ) throws Error.Failure, Error.InvalidNumber {
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
             registrationManager.verifyAccount(verificationCode, pin);
         } catch (OverlappingFileLockException e) {
             throw new SignalControl.Error.Failure("Account is already in use");

-        } catch (IOException | PinLockedException | IncorrectPinException e) {
+        } 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());
+        } catch (PinLockMissingException e) {
+            throw new Error.Failure("Account is pin locked, but pin data has been deleted on the server.");

         }
     }
 
     @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 URI deviceLinkUri = c.getNewProvisioningDeviceLinkUri();
-            new Thread(() -> {
-                final ProvisioningManager provisioningManager = c.getProvisioningManagerFor(deviceLinkUri);
-                try {
-                    provisioningManager.finishDeviceLink(newDeviceName);
-                } catch (IOException | TimeoutException | UserAlreadyExists e) {
-                    e.printStackTrace();
-                }
-            }).start();
-            return deviceLinkUri.toString();
+            deviceLinkUri = c.getNewProvisioningDeviceLinkUri();

         } catch (TimeoutException | IOException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
         }
         } 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
     }
 
     @Override


@@ -119,7 +145,7 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
         try {
             final var provisioningManager = c.getProvisioningManagerFor(new URI(deviceLinkUri));
             return provisioningManager.finishDeviceLink(newDeviceName);
         try {
             final var provisioningManager = c.getProvisioningManagerFor(new URI(deviceLinkUri));
             return provisioningManager.finishDeviceLink(newDeviceName);

-        } catch (TimeoutException | IOException | UserAlreadyExists | URISyntaxException e) {
+        } catch (TimeoutException | IOException | UserAlreadyExistsException | URISyntaxException e) {

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