Switch to a less cpu intensive function to check if libsignal-client is available

[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..2d2114447ac538e751c8a16a94f730cc8ef5486b 100644 (file)
--- 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());
         }
     }
 
@@ -90,14 +96,16 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
     public String link(final String newDeviceName) throws Error.Failure {
         try {
             final URI deviceLinkUri = c.getNewProvisioningDeviceLinkUri();
-            new Thread(() -> {
+            final var thread = new Thread(() -> {
                 final ProvisioningManager provisioningManager = c.getProvisioningManagerFor(deviceLinkUri);
                 try {
                     provisioningManager.finishDeviceLink(newDeviceName);
                 } catch (IOException | TimeoutException | UserAlreadyExists e) {
                     e.printStackTrace();
                 }
-            }).start();
+            });
+            thread.setName("dbus-link");
+            thread.start();
             return deviceLinkUri.toString();
         } catch (TimeoutException | IOException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());