import net.sourceforge.argparse4j.ArgumentParsers;
import net.sourceforge.argparse4j.impl.Arguments;
import net.sourceforge.argparse4j.inf.*;
-import org.apache.commons.io.IOUtils;
import org.apache.http.util.TextUtils;
import org.asamk.Signal;
import org.freedesktop.dbus.DBusConnection;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.charset.Charset;
import java.security.Security;
import java.util.ArrayList;
import java.util.List;
System.exit(3);
}
break;
+ case "removeDevice":
+ if (dBusConn != null) {
+ System.err.println("removeDevice is not yet implemented via dbus");
+ System.exit(1);
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ System.exit(1);
+ }
+ try {
+ int deviceId = ns.getInt("deviceId");
+ m.removeLinkedDevices(deviceId);
+ } catch (IOException e) {
+ e.printStackTrace();
+ System.exit(3);
+ }
+ break;
case "send":
if (dBusConn == null && !m.isRegistered()) {
System.err.println("User is not registered.");
String messageText = ns.getString("message");
if (messageText == null) {
try {
- messageText = IOUtils.toString(System.in);
+ messageText = readAll(System.in);
} catch (IOException e) {
System.err.println("Failed to read message from stdin: " + e.getMessage());
System.err.println("Aborting sending.");
.help("Show package version.")
.action(Arguments.version());
parser.addArgument("--config")
- .help("Set the path, where to store the config (Default: $HOME/.config/signal-cli).");
+ .help("Set the path, where to store the config (Default: $HOME/.config/signal).");
MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
mut.addArgument("-u", "--username")
Subparser parserDevices = subparsers.addParser("listDevices");
+ Subparser parserRemoveDevice = subparsers.addParser("removeDevice");
+ parserRemoveDevice.addArgument("-d", "--deviceId")
+ .type(int.class)
+ .required(true)
+ .help("Specify the device you want to remove. Use listDevices to see the deviceIds.");
+
Subparser parserRegister = subparsers.addParser("register");
parserRegister.addArgument("-v", "--voice")
.help("The verification should be done over voice, not sms.")
System.err.println("Failed to send message: " + e.getMessage());
}
+ private static String readAll(InputStream in) throws IOException {
+ StringWriter output = new StringWriter();
+ byte[] buffer = new byte[4096];
+ long count = 0;
+ int n;
+ while (-1 != (n = System.in.read(buffer))) {
+ output.write(new String(buffer, 0, n, Charset.defaultCharset()));
+ count += n;
+ }
+ return output.toString();
+ }
+
private static class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
final Manager m;
}
@Override
- public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
+ public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content) {
SignalServiceAddress source = envelope.getSourceAddress();
- System.out.println(String.format("Envelope from: %s (device: %d)", source.getNumber(), envelope.getSourceDevice()));
+ ContactInfo sourceContact = m.getContact(source.getNumber());
+ System.out.println(String.format("Envelope from: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getNumber(), envelope.getSourceDevice()));
if (source.getRelay().isPresent()) {
System.out.println("Relayed by: " + source.getRelay().get());
}
} else {
if (content.getDataMessage().isPresent()) {
SignalServiceDataMessage message = content.getDataMessage().get();
- handleSignalServiceDataMessage(message, group);
+ handleSignalServiceDataMessage(message);
}
if (content.getSyncMessage().isPresent()) {
System.out.println("Received a sync message");
if (syncMessage.getRead().isPresent()) {
System.out.println("Received sync read messages list");
for (ReadMessage rm : syncMessage.getRead().get()) {
- System.out.println("From: " + rm.getSender() + " Message timestamp: " + rm.getTimestamp());
+ ContactInfo fromContact = m.getContact(rm.getSender());
+ System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + rm.getTimestamp());
}
}
if (syncMessage.getRequest().isPresent()) {
if (syncMessage.getSent().isPresent()) {
System.out.println("Received sync sent message");
final SentTranscriptMessage sentTranscriptMessage = syncMessage.getSent().get();
- System.out.println("To: " + (sentTranscriptMessage.getDestination().isPresent() ? sentTranscriptMessage.getDestination().get() : "Unknown") + " , Message timestamp: " + sentTranscriptMessage.getTimestamp());
+ String to;
+ if (sentTranscriptMessage.getDestination().isPresent()) {
+ String dest = sentTranscriptMessage.getDestination().get();
+ ContactInfo destContact = m.getContact(dest);
+ to = (destContact == null ? "" : "“" + destContact.name + "” ") + dest;
+ } else {
+ to = "Unknown";
+ }
+ System.out.println("To: " + to + " , Message timestamp: " + sentTranscriptMessage.getTimestamp());
SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
- handleSignalServiceDataMessage(message, null);
+ handleSignalServiceDataMessage(message);
}
}
}
System.out.println();
}
- // TODO remove group parameter
- private void handleSignalServiceDataMessage(SignalServiceDataMessage message, GroupInfo group) {
+ private void handleSignalServiceDataMessage(SignalServiceDataMessage message) {
System.out.println("Message timestamp: " + message.getTimestamp());
if (message.getBody().isPresent()) {
SignalServiceGroup groupInfo = message.getGroupInfo().get();
System.out.println("Group info:");
System.out.println(" Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
- if (groupInfo.getName().isPresent()) {
+ if (groupInfo.getType() == SignalServiceGroup.Type.UPDATE && groupInfo.getName().isPresent()) {
System.out.println(" Name: " + groupInfo.getName().get());
- } else if (group != null) {
- System.out.println(" Name: " + group.name);
} else {
- System.out.println(" Name: <Unknown group>");
+ GroupInfo group = m.getGroup(groupInfo.getGroupId());
+ if (group != null) {
+ System.out.println(" Name: " + group.name);
+ } else {
+ System.out.println(" Name: <Unknown group>");
+ }
}
System.out.println(" Type: " + groupInfo.getType());
if (groupInfo.getMembers().isPresent()) {
}
@Override
- public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
- super.handleMessage(envelope, content, group);
+ public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content) {
+ super.handleMessage(envelope, content);
if (!envelope.isReceipt() && content != null && content.getDataMessage().isPresent()) {
SignalServiceDataMessage message = content.getDataMessage().get();
}
}
- private void printAttachment(SignalServiceAttachment attachment) {
- System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")");
- if (attachment.isPointer()) {
- final SignalServiceAttachmentPointer pointer = attachment.asPointer();
- System.out.println(" Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : ""));
- System.out.println(" Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "<unavailable>") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));
- File file = m.getAttachmentFile(pointer.getId());
- if (file.exists()) {
- System.out.println(" Stored plaintext in: " + file);
- }
- }
- }
}
}
git.nmode.ca / signal-cli / blobdiff
