webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 02:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update group with remaining options, after creating it

Browse source
This commit is contained in:
AsamK 2021-05-15 18:26:45 +02:00
parent ea633efc9c
commit 81ee2c2d2b
3 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -1060,7 +1060,7 @@ public class Manager implements Closeable {
result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second()); result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
} }
if (result == null || name != null || description != null || avatarFile != null) { if (name != null || description != null || avatarFile != null) {
var groupGroupChangePair = groupV2Helper.updateGroup(group, name, description, avatarFile); var groupGroupChangePair = groupV2Helper.updateGroup(group, name, description, avatarFile);
if (avatarFile != null) { if (avatarFile != null) {
avatarStore.storeGroupAvatar(group.getGroupId(), avatarStore.storeGroupAvatar(group.getGroupId(),

37
src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
View file

@ -98,22 +98,27 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand {
groupMembers, groupMembers,
groupAvatar == null ? null : new File(groupAvatar)); groupAvatar == null ? null : new File(groupAvatar));
ErrorUtils.handleTimestampAndSendMessageResults(writer, 0, results.second()); ErrorUtils.handleTimestampAndSendMessageResults(writer, 0, results.second());
final var newGroupId = results.first(); groupId = results.first();
writer.println("Created new group: \"{}\"", newGroupId.toBase64()); writer.println("Created new group: \"{}\"", groupId.toBase64());
} else { groupName = null;
var results = m.updateGroup(groupId, groupMembers = null;
groupName, groupAvatar = null;
groupDescription, }
groupMembers,
groupRemoveMembers, var results = m.updateGroup(groupId,
groupAdmins, groupName,
groupRemoveAdmins, groupDescription,
groupResetLink, groupMembers,
groupLinkState != null ? groupLinkState.toLinkState() : null, groupRemoveMembers,
groupAddMemberPermission != null ? groupAddMemberPermission.toManager() : null, groupAdmins,
groupEditDetailsPermission != null ? groupEditDetailsPermission.toManager() : null, groupRemoveAdmins,
groupAvatar == null ? null : new File(groupAvatar), groupResetLink,
groupExpiration); 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()); ErrorUtils.handleTimestampAndSendMessageResults(writer, results.first(), results.second());
} }
} catch (AttachmentInvalidException e) { } catch (AttachmentInvalidException e) {

4
src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
View file

@ -355,7 +355,9 @@ public class DbusSignalImpl implements Signal {
null, null,
avatar == null ? null : new File(avatar), avatar == null ? null : new File(avatar),
null); null);
checkSendMessageResults(results.first(), results.second()); if (results != null) {
checkSendMessageResults(results.first(), results.second());
}
return groupId; return groupId;
} }
} catch (IOException e) { } catch (IOException e) {