import org.apache.http.util.TextUtils;
import org.asamk.Signal;
import org.freedesktop.dbus.DBusConnection;
+import org.freedesktop.dbus.DBusSigHandler;
import org.freedesktop.dbus.exceptions.DBusException;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
import org.whispersystems.signalservice.api.messages.*;
import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
public static void main(String[] args) {
// Workaround for BKS truststore
- Security.insertProviderAt(new org.spongycastle.jce.provider.BouncyCastleProvider(), 1);
+ Security.insertProviderAt(new org.bouncycastle.jce.provider.BouncyCastleProvider(), 1);
Namespace ns = parseArgs(args);
if (ns == null) {
break;
case "receive":
if (dBusConn != null) {
- System.err.println("receive is not yet implementd via dbus");
- System.exit(1);
+ try {
+ dBusConn.addSigHandler(Signal.MessageReceived.class, new DBusSigHandler<Signal.MessageReceived>() {
+ @Override
+ public void handle(Signal.MessageReceived s) {
+ System.out.print(String.format("Envelope from: %s\nTimestamp: %d\nBody: %s\n",
+ s.getSender(), s.getTimestamp(), s.getMessage()));
+ if (s.getGroupId().length > 0) {
+ System.out.println("Group info:");
+ System.out.println(" Id: " + Base64.encodeBytes(s.getGroupId()));
+ }
+ if (s.getAttachments().size() > 0) {
+ System.out.println("Attachments: ");
+ for (String attachment : s.getAttachments()) {
+ System.out.println("- Stored plaintext in: " + attachment);
+ }
+ }
+ System.out.println();
+ }
+ });
+ } catch (DBusException e) {
+ e.printStackTrace();
+ }
+ while (true) {
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+ System.exit(0);
+ }
+ }
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
private static void handleAssertionError(AssertionError e) {
System.err.println("Failed to send/receive message (Assertion): " + e.getMessage());
- System.err.println(e.getStackTrace());
+ e.printStackTrace();
System.err.println("If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README");
System.exit(1);
}
@Override
public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
- System.out.println("Envelope from: " + envelope.getSource());
+ SignalServiceAddress source = envelope.getSourceAddress();
+ System.out.println(String.format("Envelope from: %s (device: %d)", source.getNumber(), envelope.getSourceDevice()));
+ if (source.getRelay().isPresent()) {
+ System.out.println("Relayed by: " + source.getRelay().get());
+ }
System.out.println("Timestamp: " + envelope.getTimestamp());
if (envelope.isReceipt()) {
}
}
- private static class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler {
- final Manager m;
+ private static class DbusReceiveMessageHandler extends ReceiveMessageHandler {
final DBusConnection conn;
public DbusReceiveMessageHandler(Manager m, DBusConnection conn) {
- this.m = m;
+ super(m);
this.conn = conn;
}
@Override
public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
- System.out.println("Envelope from: " + envelope.getSource());
- System.out.println("Timestamp: " + envelope.getTimestamp());
-
- if (envelope.isReceipt()) {
- System.out.println("Got receipt.");
- } else if (envelope.isSignalMessage() | envelope.isPreKeySignalMessage()) {
- if (content == null) {
- System.out.println("Failed to decrypt message.");
- } else {
- if (content.getDataMessage().isPresent()) {
- SignalServiceDataMessage message = content.getDataMessage().get();
-
- System.out.println("Message timestamp: " + message.getTimestamp());
-
- if (message.getBody().isPresent()) {
- System.out.println("Body: " + message.getBody().get());
- }
-
- if (message.getGroupInfo().isPresent()) {
- SignalServiceGroup groupInfo = message.getGroupInfo().get();
- System.out.println("Group info:");
- System.out.println(" Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
- if (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>");
- }
- System.out.println(" Type: " + groupInfo.getType());
- if (groupInfo.getMembers().isPresent()) {
- for (String member : groupInfo.getMembers().get()) {
- System.out.println(" Member: " + member);
- }
- }
- if (groupInfo.getAvatar().isPresent()) {
- System.out.println(" Avatar:");
- printAttachment(groupInfo.getAvatar().get());
- }
- }
- if (message.isEndSession()) {
- System.out.println("Is end session");
- }
-
- List<String> attachments = new ArrayList<>();
- if (message.getAttachments().isPresent()) {
- System.out.println("Attachments: ");
- for (SignalServiceAttachment attachment : message.getAttachments().get()) {
- if (attachment.isPointer()) {
- attachments.add(m.getAttachmentFile(attachment.asPointer().getId()).getAbsolutePath());
- }
- printAttachment(attachment);
- }
- }
- if (!message.isEndSession() &&
- !(message.getGroupInfo().isPresent() && message.getGroupInfo().get().getType() != SignalServiceGroup.Type.DELIVER)) {
- try {
- conn.sendSignal(new Signal.MessageReceived(
- SIGNAL_OBJECTPATH,
- envelope.getSource(),
- message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
- message.getBody().isPresent() ? message.getBody().get() : "",
- attachments));
- } catch (DBusException e) {
- e.printStackTrace();
+ super.handleMessage(envelope, content, group);
+
+ if (!envelope.isReceipt() && 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());
}
}
}
- if (content.getSyncMessage().isPresent()) {
- SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
- System.out.println("Received sync message");
+
+ 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();
}
}
- } else {
- System.out.println("Unknown message received.");
}
- System.out.println();
}
private void printAttachment(SignalServiceAttachment attachment) {
git.nmode.ca / signal-cli / blobdiff
