Merge a6b4392fd7549f23fef1faaaa146c5408011d7c5 into 5d5fa64f01601538f6c410695f633302ea5c933f

Dockerfile

@@ -1,10 +1,9 @@
 ARG SIGNAL_CLI_VERSION=0.13.24
 ARG LIBSIGNAL_CLIENT_VERSION=0.87.0
-ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.13.24+morph027+2
+ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.13.24+morph027+1
 
 ARG SWAG_VERSION=1.16.4
-ARG GRAALVM_VERSION=21.0.0
-#ARG GRAALVM_VERSION=25.0.2
+ARG GRAALVM_VERSION=25.0.2
 
 ARG BUILD_VERSION_ARG=unset
 

src/client/client.go

@@ -1231,6 +1231,8 @@ func (s *SignalClient) RemoveMembersFromGroup(number string, groupId string, mem
 }
 
 func (s *SignalClient) updateGroupAdmins(number string, groupId string, admins []string, add bool) error {
+	var err error
+
 	if len(admins) == 0 {
 		return nil
 	}
@@ -1268,7 +1270,6 @@ func (s *SignalClient) updateGroupAdmins(number string, groupId string, admins [
 			return err
 		}
 		_, err = jsonRpc2Client.getRaw("updateGroup", &number, request)
-		return err
 	} else {
 		cmd := []string{"--config", s.signalCliConfig, "-a", number, "updateGroup", "-g", internalGroupId}
 
@@ -1280,8 +1281,8 @@ func (s *SignalClient) updateGroupAdmins(number string, groupId string, admins [
 		cmd = append(cmd, admins...)
 
 		_, err = s.cliClient.Execute(true, cmd, "")
-		return err
 	}
+	return err
 }
 
 func (s *SignalClient) AddAdminsToGroup(number string, groupId string, admins []string) error {