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

Exit on timeout when receiving

Browse source 
- Could be made optional in the future
- Sending messages while receiving results in damaged session state
  because both save their own state
This commit is contained in:
AsamK 2015-07-08 11:52:06 +02:00
parent bd485ec9f7
commit 704f2d76ba
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/cli/Main.java
View file

@ -186,7 +186,7 @@ public class Main {
System.exit(1);
}
try {
m.receiveMessages(new Manager.ReceiveMessageHandler() {
m.receiveMessages(5, true, new Manager.ReceiveMessageHandler() {
@Override
public void handleMessage(TextSecureEnvelope envelope) {
System.out.println("Envelope from: " + envelope.getSource());
@ -233,5 +233,6 @@ public class Main {
break;
}
m.save();
System.exit(0);
}
}

6
src/main/java/cli/Manager.java
View file

@ -187,7 +187,7 @@ public class Manager {
void handleMessage(TextSecureEnvelope envelope);
}
public void receiveMessages(ReceiveMessageHandler handler) throws IOException {
public void receiveMessages(int timeoutSeconds, boolean returnOnTimeout, ReceiveMessageHandler handler) throws IOException {
TextSecureMessageReceiver messageReceiver = new TextSecureMessageReceiver(URL, TRUST_STORE, username, password, signalingKey);
TextSecureMessagePipe messagePipe = null;
@ -197,9 +197,11 @@ public class Manager {
while (true) {
TextSecureEnvelope envelope;
try {
envelope = messagePipe.read(1, TimeUnit.MINUTES);
envelope = messagePipe.read(timeoutSeconds, TimeUnit.SECONDS);
handler.handleMessage(envelope);
} catch (TimeoutException e) {
if (returnOnTimeout)
return;
} catch (InvalidVersionException e) {
System.out.println("Ignoring error: " + e.getMessage());
}