Rename Cli class to App

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

diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index 787f47abb79a4434327ef01b858ee68b9f6529b6..fd3f1efc1939400a94d42075e76dc18dc212d247 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -69,7 +69,7 @@ class JsonDataMessage {
     public JsonDataMessage(Signal.MessageReceived messageReceived) {
         timestamp = messageReceived.getTimestamp();
         message = messageReceived.getMessage();
     public JsonDataMessage(Signal.MessageReceived messageReceived) {
         timestamp = messageReceived.getTimestamp();
         message = messageReceived.getMessage();

-        groupInfo = new JsonGroupInfo(messageReceived.getGroupId());
+        groupInfo = messageReceived.getGroupId().length > 0 ? new JsonGroupInfo(messageReceived.getGroupId()) : null;

         reaction = null;    // TODO Replace these 4 with the proper commands
         quote = null;
         mentions = null;
         reaction = null;    // TODO Replace these 4 with the proper commands
         quote = null;
         mentions = null;


@@ -80,7 +80,7 @@ class JsonDataMessage {
     public JsonDataMessage(Signal.SyncMessageReceived messageReceived) {
         timestamp = messageReceived.getTimestamp();
         message = messageReceived.getMessage();
     public JsonDataMessage(Signal.SyncMessageReceived messageReceived) {
         timestamp = messageReceived.getTimestamp();
         message = messageReceived.getMessage();

-        groupInfo = new JsonGroupInfo(messageReceived.getGroupId());
+        groupInfo = messageReceived.getGroupId().length > 0 ? new JsonGroupInfo(messageReceived.getGroupId()) : null;

         reaction = null;    // TODO Replace these 4 with the proper commands
         quote = null;
         mentions = null;
         reaction = null;    // TODO Replace these 4 with the proper commands
         quote = null;
         mentions = null;