Catch all exceptions when deserializig session records

[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 2e9ae08b06217f91d4811fd591017e5cb87886fa..cfd17610d33c6d88ffd2c40b3d6ed695f9b7bcff 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -15,9 +15,9 @@ 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.List;
 import java.util.concurrent.TimeoutException;

-import java.util.stream.Collectors;

 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 


@@ -60,6 +60,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 +78,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());
         }


@@ -106,9 +110,6 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
     @Override
     public List<DBusPath> listAccounts() {
 
     @Override
     public List<DBusPath> listAccounts() {

-        return c.getAccountNumbers()
-                .stream()
-                .map(u -> new DBusPath(DbusConfig.getObjectPath(u)))
-                .collect(Collectors.toList());
+        return c.getAccountNumbers().stream().map(u -> new DBusPath(DbusConfig.getObjectPath(u))).toList();

     }
 }
     }
 }