Update group with remaining options, after creating it

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

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 6ecf2abaa19b8523b8b17414faec727b5f1a6eac..2c3871ab389f2603ac4db564582c8d62d67e9d31 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -8,6 +8,7 @@ import org.asamk.signal.manager.NotMasterDeviceException;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.manager.groups.LastGroupAdminException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.storage.identities.IdentityInfo;
 import org.asamk.signal.util.ErrorUtils;
@@ -24,6 +25,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -349,9 +351,13 @@ public class DbusSignalImpl implements Signal {
                         null,
                         false,
                         null,
+                        null,
+                        null,
                         avatar == null ? null : new File(avatar),
                         null);
-                checkSendMessageResults(results.first(), results.second());
+                if (results != null) {
+                    checkSendMessageResults(results.first(), results.second());
+                }
                 return groupId;
             }
         } catch (IOException e) {
@@ -440,11 +446,13 @@ public class DbusSignalImpl implements Signal {
     public void quitGroup(final byte[] groupId) {
         var group = GroupId.unknownVersion(groupId);
         try {
-            m.sendQuitGroupMessage(group);
+            m.sendQuitGroupMessage(group, Set.of());
         } catch (GroupNotFoundException | NotAGroupMemberException e) {
             throw new Error.GroupNotFound(e.getMessage());
-        } catch (IOException e) {
+        } catch (IOException | LastGroupAdminException e) {
             throw new Error.Failure(e.getMessage());
+        } catch (InvalidNumberException e) {
+            throw new Error.InvalidNumber(e.getMessage());
         }
     }