Update libsignal-service-java

[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 f80b91d6544d7c44a07ca4a6148b43614a8c5dda..5c4d807ecca04e95e2abc17900436a7d5b24ab1a 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -7,10 +7,12 @@ 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.api.UserAlreadyExistsException;

 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.PinLockedException;
 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 java.io.IOException;
 import org.freedesktop.dbus.DBusPath;
 
 import java.io.IOException;


@@ -58,9 +60,14 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
         }
         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) {
         } catch (OverlappingFileLockException e) {
             throw new SignalControl.Error.Failure("Account is already in use");
         } catch (IOException e) {