Improve error message when an account is already in use

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index 2e9ae08b06217f91d4811fd591017e5cb87886fa..dc23fed9be261818a364fac2b0f258c4cb70f409 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -15,6 +15,7 @@ import org.freedesktop.dbus.DBusPath;
 
 import java.io.IOException;
 import java.net.URI;
 
 import java.io.IOException;
 import java.net.URI;

+import java.nio.channels.OverlappingFileLockException;

 import java.util.List;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;


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

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


@@ -76,6 +79,8 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
     ) throws Error.Failure, Error.InvalidNumber {
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
             registrationManager.verifyAccount(verificationCode, 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");

         } catch (IOException | PinLockedException | IncorrectPinException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
         }
         } catch (IOException | PinLockedException | IncorrectPinException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
         }

diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
index 23c89f26ef810c596a7bf8bbb595b204675b1e1f..8d13ad2875ad1b819fb23ed9b51643cf686c10ad 100644 (file)
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
@@ -27,6 +27,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;

+import java.nio.channels.OverlappingFileLockException;

 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;


@@ -182,6 +183,9 @@ public class SignalJsonRpcDispatcherHandler {
                 final var registrationManager = c.getNewRegistrationManager(params.get("account").asText());
                 ((ObjectNode) params).remove("account");
                 return registrationManager;
                 final var registrationManager = c.getNewRegistrationManager(params.get("account").asText());
                 ((ObjectNode) params).remove("account");
                 return registrationManager;

+            } catch (OverlappingFileLockException e) {
+                logger.warn("Account is already in use");
+                return null;

             } catch (IOException | IllegalStateException e) {
                 logger.warn("Failed to load registration manager", e);
                 return null;
             } catch (IOException | IllegalStateException e) {
                 logger.warn("Failed to load registration manager", e);
                 return null;