Correctly use API for sending non group messages

[signal-cli] / src / main / java / org / asamk / signal / Main.java

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 00366e5a3ba275b9e8d4bf6c0ca244deae6e3fe3..e5a2288f1f40b18d8e50b70d036a01dd7c8b60a2 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -28,6 +28,8 @@ 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.ReadMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
@@ -109,7 +111,7 @@ public class Main {
             switch (ns.getString("command")) {
                 case "register":
                     if (dBusConn != null) {
-                        System.err.println("register is not yet implementd via dbus");
+                        System.err.println("register is not yet implemented via dbus");
                         System.exit(1);
                     }
                     if (!m.userHasKeys()) {
@@ -124,7 +126,7 @@ public class Main {
                     break;
                 case "verify":
                     if (dBusConn != null) {
-                        System.err.println("verify is not yet implementd via dbus");
+                        System.err.println("verify is not yet implemented via dbus");
                         System.exit(1);
                     }
                     if (!m.userHasKeys()) {
@@ -164,6 +166,8 @@ public class Main {
                             handleAssertionError(e);
                         } catch (DBusExecutionException e) {
                             handleDBusExecutionException(e);
+                        } catch (UntrustedIdentityException e) {
+                            e.printStackTrace();
                         }
                     } else {
                         String messageText = ns.getString("message");
@@ -202,6 +206,8 @@ public class Main {
                             System.exit(1);
                         } catch (DBusExecutionException e) {
                             handleDBusExecutionException(e);
+                        } catch (UntrustedIdentityException e) {
+                            e.printStackTrace();
                         }
                     }
 
@@ -262,7 +268,7 @@ public class Main {
                     break;
                 case "quitGroup":
                     if (dBusConn != null) {
-                        System.err.println("quitGroup is not yet implementd via dbus");
+                        System.err.println("quitGroup is not yet implemented via dbus");
                         System.exit(1);
                     }
                     if (!m.isRegistered()) {
@@ -280,12 +286,14 @@ public class Main {
                         handleAssertionError(e);
                     } catch (GroupNotFoundException e) {
                         handleGroupNotFoundException(e);
+                    } catch (UntrustedIdentityException e) {
+                        e.printStackTrace();
                     }
 
                     break;
                 case "updateGroup":
                     if (dBusConn != null) {
-                        System.err.println("updateGroup is not yet implementd via dbus");
+                        System.err.println("updateGroup is not yet implemented via dbus");
                         System.exit(1);
                     }
                     if (!m.isRegistered()) {
@@ -312,6 +320,8 @@ public class Main {
                         handleGroupNotFoundException(e);
                     } catch (EncapsulatedExceptions e) {
                         handleEncapsulatedExceptions(e);
+                    } catch (UntrustedIdentityException e) {
+                        e.printStackTrace();
                     }
 
                     break;
@@ -537,48 +547,41 @@ public class Main {
                 } else {
                     if (content.getDataMessage().isPresent()) {
                         SignalServiceDataMessage message = content.getDataMessage().get();
+                        handleSignalServiceDataMessage(message, group);
+                    }
+                    if (content.getSyncMessage().isPresent()) {
+                        SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
 
-                        System.out.println("Message timestamp: " + message.getTimestamp());
-
-                        if (message.getBody().isPresent()) {
-                            System.out.println("Body: " + message.getBody().get());
+                        if (syncMessage.getContacts().isPresent()) {
+                            System.out.println("Received sync contacts");
+                            printAttachment(syncMessage.getContacts().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>");
+                        if (syncMessage.getGroups().isPresent()) {
+                            System.out.println("Received sync groups");
+                            printAttachment(syncMessage.getGroups().get());
+                        }
+                        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());
                             }
-                            System.out.println("  Type: " + groupInfo.getType());
-                            if (groupInfo.getMembers().isPresent()) {
-                                for (String member : groupInfo.getMembers().get()) {
-                                    System.out.println("  Member: " + member);
-                                }
+                        }
+                        if (syncMessage.getRequest().isPresent()) {
+                            System.out.println("Received sync request");
+                            if (syncMessage.getRequest().get().isContactsRequest()) {
+                                System.out.println(" - contacts request");
                             }
-                            if (groupInfo.getAvatar().isPresent()) {
-                                System.out.println("  Avatar:");
-                                printAttachment(groupInfo.getAvatar().get());
+                            if (syncMessage.getRequest().get().isGroupsRequest()) {
+                                System.out.println(" - groups request");
                             }
                         }
-                        if (message.isEndSession()) {
-                            System.out.println("Is end session");
+                        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());
+                            SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
+                            handleSignalServiceDataMessage(message, null);
                         }
-
-                        if (message.getAttachments().isPresent()) {
-                            System.out.println("Attachments: ");
-                            for (SignalServiceAttachment attachment : message.getAttachments().get()) {
-                                printAttachment(attachment);
-                            }
-                        }
-                    }
-                    if (content.getSyncMessage().isPresent()) {
-                        SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
-                        System.out.println("Received sync message");
                     }
                 }
             } else {
@@ -587,6 +590,47 @@ public class Main {
             System.out.println();
         }
 
+        // TODO remove group parameter
+        private void handleSignalServiceDataMessage(SignalServiceDataMessage message, GroupInfo group) {
+            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");
+            }
+
+            if (message.getAttachments().isPresent()) {
+                System.out.println("Attachments: ");
+                for (SignalServiceAttachment attachment : message.getAttachments().get()) {
+                    printAttachment(attachment);
+                }
+            }
+        }
+
         private void printAttachment(SignalServiceAttachment attachment) {
             System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")");
             if (attachment.isPointer()) {