marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Show Stats 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());
}
if (result == null || name != null || description != null || avatarFile != null) {
if (name != null || description != null || avatarFile != null) {
var groupGroupChangePair = groupV2Helper.updateGroup(group, name, description, avatarFile);
if (avatarFile != null) {
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,
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) {

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

@ -355,7 +355,9 @@ public class DbusSignalImpl implements Signal {
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) {