webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use improved shutdown for receive command

Browse source
This commit is contained in:
AsamK 2023-11-09 19:22:58 +01:00
parent 1058e33f12
commit 5d33f71d4d
4 changed files with 37 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/org/asamk/signal/commands/ReceiveCommand.java
View file

@ -8,6 +8,7 @@ import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.OutputType;
import org.asamk.signal.ReceiveMessageHandler;
import org.asamk.signal.Shutdown;
import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.commands.exceptions.IOErrorException;
import org.asamk.signal.commands.exceptions.UserErrorException;
@ -67,6 +68,7 @@ public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<Receiv
public void handleCommand(
final Namespace ns, final Manager m, final OutputWriter outputWriter
) throws CommandException {
Shutdown.installHandler();
final var timeout = ns.getDouble("timeout");
final var maxMessagesRaw = ns.getInt("max-messages");
final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
@ -80,6 +82,7 @@ public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<Receiv
};
final var duration = timeout < 0 ? null : Duration.ofMillis((long) (timeout * 1000));
final var maxMessages = maxMessagesRaw < 0 ? null : maxMessagesRaw;
Shutdown.registerShutdownListener(m::stopReceiveMessages);
m.receiveMessages(Optional.ofNullable(duration), Optional.ofNullable(maxMessages), handler);
} catch (IOException e) {
throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);

19
src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
View file

@ -3,6 +3,7 @@ package org.asamk.signal.dbus;
import org.asamk.Signal;
import org.asamk.signal.DbusConfig;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.api.AlreadyReceivingException;
import org.asamk.signal.manager.api.AttachmentInvalidException;
import org.asamk.signal.manager.api.CaptchaRequiredException;
import org.asamk.signal.manager.api.Configuration;
@ -548,10 +549,17 @@ public class DbusManagerImpl implements Manager {
}
}
private Thread receiveThread;
@Override
public void receiveMessages(
Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler
) throws IOException {
) throws IOException, AlreadyReceivingException {
if (receiveThread != null) {
throw new AlreadyReceivingException("Already receiving message.");
}
receiveThread = Thread.currentThread();
final var remainingMessages = new AtomicInteger(maxMessages.orElse(-1));
final var lastMessage = new AtomicLong(System.currentTimeMillis());
final var thread = Thread.currentThread();
@ -577,6 +585,7 @@ public class DbusManagerImpl implements Manager {
}
Thread.sleep(sleepTimeRemaining);
} catch (InterruptedException ignored) {
break;
}
}
} else {
@ -589,6 +598,14 @@ public class DbusManagerImpl implements Manager {
}
removeReceiveHandler(receiveHandler);
receiveThread = null;
}
@Override
public void stopReceiveMessages() {
if (receiveThread != null) {
receiveThread.interrupt();
}
}
@Override