X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/5e17fe8414b632246bdbd6a9051e6ee98296b2a0..HEAD:/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 def343a9..50150a98 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java @@ -10,6 +10,7 @@ import org.asamk.signal.manager.RegistrationManager; 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.RateLimitException; import org.asamk.signal.manager.api.UserAlreadyExistsException; @@ -49,14 +50,17 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl { @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( - 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( @@ -86,7 +90,9 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl { @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); @@ -100,6 +106,8 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl { + (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."); } }