marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Detect when receive has caught up with old messages

Browse Source
This commit is contained in:
AsamK 2020-06-04 18:44:13 +02:00
parent 5829e3f117
commit d14b8ac71f
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/asamk/signal/manager/Manager.java
View File

@ -1402,13 +1402,15 @@ public class Manager implements Closeable {
messagePipe = messageReceiver.createMessagePipe(); messagePipe = messageReceiver.createMessagePipe();
} }
boolean hasCaughtUpWithOldMessages = false;
while (true) { while (true) {
SignalServiceEnvelope envelope; SignalServiceEnvelope envelope;
SignalServiceContent content = null; SignalServiceContent content = null;
Exception exception = null; Exception exception = null;
final long now = new Date().getTime(); final long now = new Date().getTime();
try { try {
envelope = messagePipe.read(timeout, unit, envelope1 -> { Optional<SignalServiceEnvelope> result = messagePipe.readOrEmpty(timeout, unit, envelope1 -> {
// store message on disk, before acknowledging receipt to the server // store message on disk, before acknowledging receipt to the server
try { try {
String source = envelope1.getSourceE164().isPresent() ? envelope1.getSourceE164().get() : ""; String source = envelope1.getSourceE164().isPresent() ? envelope1.getSourceE164().get() : "";
@ -1418,6 +1420,15 @@ public class Manager implements Closeable {
System.err.println("Failed to store encrypted message in disk cache, ignoring: " + e.getMessage()); System.err.println("Failed to store encrypted message in disk cache, ignoring: " + e.getMessage());
} }
}); });
if (result.isPresent()) {
envelope = result.get();
} else {
// Received indicator that server queue is empty
hasCaughtUpWithOldMessages = true;
// Continue to wait another timeout for new messages
continue;
}
} catch (TimeoutException e) { } catch (TimeoutException e) {
if (returnOnTimeout) if (returnOnTimeout)
return; return;