nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-01-27 19:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated the JSON-RPC handler on a file lock overlap

Browse Source
This commit is contained in:
AntonKun 2025-09-22 16:28:00 +03:00 committed by Sebastian Scheibner
parent 9f1ae5f4db
commit 96ec6624c5
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
View File

@ -129,13 +129,32 @@ public class SignalJsonRpcCommandHandler {
private RegistrationManager getRegistrationManagerFromParams(final ContainerNode<?> params) {
if (params != null && params.has("account")) {
final var number = params.get("account").asText();
try {
final var registrationManager = c.getNewRegistrationManager(params.get("account").asText());
final var registrationManager = c.getNewRegistrationManager(number);
((ObjectNode) params).remove("account");
return registrationManager;
} catch (OverlappingFileLockException e) {
logger.warn("Account is already in use");
return null;
logger.warn("Account is already in use, attempting to close existing manager and retry: {}", number);
try {
final var existingManager = c.getManager(number);
if (existingManager != null) {
existingManager.close();
}
} catch (Throwable closeError) {
logger.warn("Failed to close existing manager for {}: {}", number, closeError.getMessage());
}
try {
final var registrationManager = c.getNewRegistrationManager(number);
((ObjectNode) params).remove("account");
return registrationManager;
} catch (OverlappingFileLockException e2) {
logger.warn("Account still in use after closing manager: {}", number);
return null;
} catch (IOException | IllegalStateException e2) {
logger.warn("Failed to load registration manager after retry", e2);
return null;
}
} catch (IOException | IllegalStateException e) {
logger.warn("Failed to load registration manager", e);
return null;