From: AsamK <asamk@gmx.de>
Date: Sat, 16 Jan 2021 19:12:24 +0000 (+0100)
Subject: Fix group info for json dbus messages
X-Git-Tag: v0.7.3~8
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/c588130491f4f2cd4e142e829aba58f17289aa01?ds=sidebyside

Fix group info for json dbus messages
---

diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index 787f47ab..fd3f1efc 100644
--- 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();
-        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;
@@ -80,7 +80,7 @@ class JsonDataMessage {
     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;