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

Merge branch 'AsamK:master' into master

Browse source
This commit is contained in:
Adimarantis 2021-09-12 20:47:16 +02:00 • committed by GitHub
commit 26372c4ab3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 365 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/org/asamk/signal/Main.java
View file

@ -56,6 +56,9 @@ public class Main {
e.getCause().printStackTrace();
}
status = getStatusForError(e);
} catch (Throwable e) {
e.printStackTrace();
status = 2;
}
System.exit(status);
}

15
src/main/java/org/asamk/signal/ReceiveMessageHandler.java
View file

@ -8,6 +8,7 @@ import org.asamk.signal.manager.groups.GroupUtils;
import org.asamk.signal.util.DateUtils;
import org.asamk.signal.util.Util;
import org.slf4j.helpers.MessageFormatter;
import org.whispersystems.libsignal.protocol.DecryptionErrorMessage;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
import org.whispersystems.signalservice.api.messages.SignalServiceContent;
import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
@ -113,6 +114,11 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
var typingMessage = content.getTypingMessage().get();
printTypingMessage(writer.indentedWriter(), typingMessage);
}
if (content.getDecryptionErrorMessage().isPresent()) {
writer.println("Received a decryption error message (resend request)");
var decryptionErrorMessage = content.getDecryptionErrorMessage().get();
printDecryptionErrorMessage(writer.indentedWriter(), decryptionErrorMessage);
}
}
} else {
writer.println("Unknown message received.");
@ -215,6 +221,15 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
}
}
private void printDecryptionErrorMessage(
final PlainTextWriter writer, final DecryptionErrorMessage decryptionErrorMessage
) {
writer.println("Device id: {}", decryptionErrorMessage.getDeviceId());
writer.println("Timestamp: {}", DateUtils.formatTimestamp(decryptionErrorMessage.getTimestamp()));
writer.println("Ratchet key: {}",
decryptionErrorMessage.getRatchetKey().isPresent() ? "is present" : "not present");
}
private void printReceiptMessage(
final PlainTextWriter writer, final SignalServiceReceiptMessage receiptMessage
) {

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

@ -61,7 +61,8 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
final var writer = (PlainTextWriter) outputWriter;
for (var entry : registered.entrySet()) {
writer.println("{}: {}", entry.getKey(), entry.getValue());
final var uuid = entry.getValue().second();
writer.println("{}: {}", entry.getKey(), uuid != null);
}
}
}