From a803967920e3967fc894130856c250cdee1d846e Mon Sep 17 00:00:00 2001
From: technillogue <technillogue@gmail.com>
Date: Sun, 25 Apr 2021 20:00:20 -0400
Subject: [PATCH] handleCommand is supposed to be void now; put back
 accidentally removed groupInfo

---
 lib/src/main/java/org/asamk/signal/manager/Manager.java   | 2 --
 src/main/java/org/asamk/signal/commands/StdioCommand.java | 8 ++------
 src/main/java/org/asamk/signal/json/JsonDataMessage.java  | 5 ++++-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 14532d3d..5d0e7d3d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -136,12 +136,10 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.security.SignatureException;
diff --git a/src/main/java/org/asamk/signal/commands/StdioCommand.java b/src/main/java/org/asamk/signal/commands/StdioCommand.java
index 3824fba0..dcdc2287 100644
--- a/src/main/java/org/asamk/signal/commands/StdioCommand.java
+++ b/src/main/java/org/asamk/signal/commands/StdioCommand.java
@@ -68,7 +68,7 @@ class InputReader implements Runnable {
                             // verbosity flag? better yet, json acknowledgement with timestamp or message id?
                             System.out.println("sentMessage '" + command.content + "' to " + command.recipient);
                             this.m.sendMessage(command.content, attachments, recipients);
-                        } catch (AssertionError | EncapsulatedExceptions | AttachmentInvalidException | InvalidNumberException e) {
+                        } catch (AssertionError | AttachmentInvalidException | InvalidNumberException e) {
                             System.err.println("error in sending message");
                             e.printStackTrace(System.out);
                         }
@@ -99,7 +99,7 @@ public class StdioCommand implements LocalCommand {
     }
 
     @Override
-    public int handleCommand(final Namespace ns, final Manager m) {
+    public void handleCommand(final Namespace ns, final Manager m) {
         boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
         InputReader reader = new InputReader(m);
         Thread readerThread = new Thread(reader);
@@ -111,16 +111,12 @@ public class StdioCommand implements LocalCommand {
                     ignoreAttachments,
                     ns.getBoolean("json") ? new JsonReceiveMessageHandler(m) : new ReceiveMessageHandler(m)
                     /*true*/);
-            return 0;
         } catch (IOException e) {
             System.err.println("Error while receiving messages: " + e.getMessage());
-            return 3;
         } catch (AssertionError e) {
             handleAssertionError(e);
-            return 1;
         } finally {
             reader.terminate();
         }
-
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index 25b8bebe..905395a0 100644
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -72,6 +72,9 @@ class JsonDataMessage {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     final List<JsonSharedContact> contacts;
 
+    @JsonProperty
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    final JsonGroupInfo groupInfo;
 
     JsonDataMessage(SignalServiceDataMessage dataMessage, Manager m) {
         this.timestamp = dataMessage.getTimestamp();
@@ -116,7 +119,7 @@ class JsonDataMessage {
         } else {
             this.attachments = List.of();
         }
-	/*if (dataMessage.getReaction().isPresent()) { // not sure if json reactions have been implemented elsewhere
+	/*if (dataMessage.getReaction().isPresent()) { // not sure if json reactions have been properly implemented elsewhere
             final SignalServiceDataMessage.Reaction reaction = dataMessage.getReaction().get();
             this.reaction = new JsonReaction(reaction);
             this.emoji = reaction.getEmoji();