From: AsamK <asamk@gmx.de>
Date: Sun, 2 Jan 2022 16:52:20 +0000 (+0100)
Subject: Improve pin failure message in dbus mode
X-Git-Tag: v0.10.1~15
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/541ac777bcbd6590fa759d0a026aa4b195b8411d

Improve pin failure message in dbus mode
---

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index aa357444..a11d8fa0 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -81,8 +81,14 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
             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());
+        } 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());
         }
     }