import org.freedesktop.dbus.exceptions.DBusException;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
import org.whispersystems.libsignal.InvalidKeyException;
+import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
import org.whispersystems.signalservice.api.messages.*;
import org.whispersystems.signalservice.api.messages.calls.*;
import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
+import org.whispersystems.signalservice.internal.push.LockedException;
import org.whispersystems.signalservice.internal.util.Base64;
import java.io.File;
return 3;
}
break;
+ case "setPin":
+ if (dBusConn != null) {
+ System.err.println("setPin is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
+ }
+ try {
+ String registrationLockPin = ns.getString("registrationLockPin");
+ m.setRegistrationLockPin(Optional.of(registrationLockPin));
+ } catch (IOException e) {
+ System.err.println("Set pin error: " + e.getMessage());
+ return 3;
+ }
+ break;
+ case "removePin":
+ if (dBusConn != null) {
+ System.err.println("removePin is not yet implemented via dbus");
+ return 1;
+ }
+ if (!m.isRegistered()) {
+ System.err.println("User is not registered.");
+ return 1;
+ }
+ try {
+ m.setRegistrationLockPin(Optional.<String>absent());
+ } catch (IOException e) {
+ System.err.println("Remove pin error: " + e.getMessage());
+ return 3;
+ }
+ break;
case "verify":
if (dBusConn != null) {
System.err.println("verify is not yet implemented via dbus");
return 1;
}
try {
- m.verifyAccount(ns.getString("verificationCode"));
+ String verificationCode = ns.getString("verificationCode");
+ String pin = ns.getString("pin");
+ m.verifyAccount(verificationCode, pin);
+ } catch (LockedException e) {
+ System.err.println("Verification failed! This number is locked with a pin. Hours remaining until reset: " + (e.getTimeRemaining() / 1000 / 60 / 60));
+ System.err.println("Use '--pin PIN_CODE' to specify the registration lock PIN");
+ return 3;
} catch (IOException e) {
System.err.println("Verify error: " + e.getMessage());
return 3;
}
ignoreAttachments = ns.getBoolean("ignore_attachments");
try {
- m.receiveMessages(1, TimeUnit.HOURS, false, ignoreAttachments, new DbusReceiveMessageHandler(m, conn));
+ m.receiveMessages(1, TimeUnit.HOURS, false, ignoreAttachments, ns.getBoolean("json") ? new JsonDbusReceiveMessageHandler(m, conn) : new DbusReceiveMessageHandler(m, conn));
} catch (IOException e) {
System.err.println("Error while receiving messages: " + e.getMessage());
return 3;
Subparser parserUpdateAccount = subparsers.addParser("updateAccount");
parserUpdateAccount.help("Update the account attributes on the signal server.");
+ Subparser parserSetPin = subparsers.addParser("setPin");
+ parserSetPin.addArgument("registrationLockPin")
+ .help("The registration lock PIN, that will be required for new registrations (resets after 7 days of inactivity)");
+
+ Subparser parserRemovePin = subparsers.addParser("removePin");
+
Subparser parserVerify = subparsers.addParser("verify");
parserVerify.addArgument("verificationCode")
.help("The verification code you received via sms or voice call.");
+ parserVerify.addArgument("-p", "--pin")
+ .help("The registration lock PIN, that was set by the user (Optional)");
Subparser parserSend = subparsers.addParser("send");
parserSend.addArgument("-g", "--group")
parserDaemon.addArgument("--ignore-attachments")
.help("Don’t download attachments of received messages.")
.action(Arguments.storeTrue());
+ parserDaemon.addArgument("--json")
+ .help("Output received messages in json format, one json object per line.")
+ .action(Arguments.storeTrue());
try {
Namespace ns = parser.parseArgs(args);
System.out.println("Profile key update, key length:" + message.getProfileKey().get().length);
}
+ if (message.getQuote().isPresent()) {
+ SignalServiceDataMessage.Quote quote = message.getQuote().get();
+ System.out.println("Quote: (" + quote.getId() + ")");
+ System.out.println(" Author: " + quote.getAuthor().getNumber());
+ System.out.println(" Text: " + quote.getText());
+ if (quote.getAttachments().size() > 0) {
+ System.out.println(" Attachments: ");
+ for (SignalServiceDataMessage.Quote.QuotedAttachment attachment : quote.getAttachments()) {
+ System.out.println(" Filename: " + attachment.getFileName());
+ System.out.println(" Type: " + attachment.getContentType());
+ System.out.println(" Thumbnail:");
+ printAttachment(attachment.getThumbnail());
+ }
+ }
+ }
+
if (message.getAttachments().isPresent()) {
System.out.println("Attachments: ");
for (SignalServiceAttachment attachment : message.getAttachments().get()) {
}
}
+ private static class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
+ final DBusConnection conn;
+
+ public JsonDbusReceiveMessageHandler(Manager m, DBusConnection conn) {
+ super(m);
+ this.conn = conn;
+ }
+
+ @Override
+ public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
+ super.handleMessage(envelope, content, exception);
+
+ if (envelope.isReceipt()) {
+ try {
+ conn.sendSignal(new Signal.ReceiptReceived(
+ SIGNAL_OBJECTPATH,
+ envelope.getTimestamp(),
+ envelope.getSource()
+ ));
+ } catch (DBusException e) {
+ e.printStackTrace();
+ }
+ } else if (content != null && content.getDataMessage().isPresent()) {
+ SignalServiceDataMessage message = content.getDataMessage().get();
+
+ if (!message.isEndSession() &&
+ !(message.getGroupInfo().isPresent() &&
+ message.getGroupInfo().get().getType() != SignalServiceGroup.Type.DELIVER)) {
+ List<String> attachments = new ArrayList<>();
+ if (message.getAttachments().isPresent()) {
+ for (SignalServiceAttachment attachment : message.getAttachments().get()) {
+ if (attachment.isPointer()) {
+ attachments.add(m.getAttachmentFile(attachment.asPointer().getId()).getAbsolutePath());
+ }
+ }
+ }
+
+ try {
+ conn.sendSignal(new Signal.MessageReceived(
+ SIGNAL_OBJECTPATH,
+ message.getTimestamp(),
+ envelope.getSource(),
+ message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
+ message.getBody().isPresent() ? message.getBody().get() : "",
+ attachments));
+ } catch (DBusException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ }
+
private static String formatTimestamp(long timestamp) {
Date date = new Date(timestamp);
final DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); // Quoted "Z" to indicate UTC, no timezone offset
git.nmode.ca / signal-cli / blobdiff
