Update group with remaining options, after creating it

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

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 6f7f87fdfb2cb985ffd17738a1c6a2613f8ed839..61d5a68a8b4604077806e469717cc76dcafd1c2b 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -98,22 +98,27 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand {
                         groupMembers,
                         groupAvatar == null ? null : new File(groupAvatar));
                 ErrorUtils.handleTimestampAndSendMessageResults(writer, 0, results.second());
-                final var newGroupId = results.first();
-                writer.println("Created new group: \"{}\"", newGroupId.toBase64());
-            } else {
-                var results = m.updateGroup(groupId,
-                        groupName,
-                        groupDescription,
-                        groupMembers,
-                        groupRemoveMembers,
-                        groupAdmins,
-                        groupRemoveAdmins,
-                        groupResetLink,
-                        groupLinkState != null ? groupLinkState.toLinkState() : null,
-                        groupAddMemberPermission != null ? groupAddMemberPermission.toManager() : null,
-                        groupEditDetailsPermission != null ? groupEditDetailsPermission.toManager() : null,
-                        groupAvatar == null ? null : new File(groupAvatar),
-                        groupExpiration);
+                groupId = results.first();
+                writer.println("Created new group: \"{}\"", groupId.toBase64());
+                groupName = null;
+                groupMembers = null;
+                groupAvatar = null;
+            }
+
+            var results = m.updateGroup(groupId,
+                    groupName,
+                    groupDescription,
+                    groupMembers,
+                    groupRemoveMembers,
+                    groupAdmins,
+                    groupRemoveAdmins,
+                    groupResetLink,
+                    groupLinkState != null ? groupLinkState.toLinkState() : null,
+                    groupAddMemberPermission != null ? groupAddMemberPermission.toManager() : null,
+                    groupEditDetailsPermission != null ? groupEditDetailsPermission.toManager() : null,
+                    groupAvatar == null ? null : new File(groupAvatar),
+                    groupExpiration);
+            if (results != null) {
                 ErrorUtils.handleTimestampAndSendMessageResults(writer, results.first(), results.second());
             }
         } catch (AttachmentInvalidException e) {