aljaz/signal-cli
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli.git synced 2026-01-02 13:54:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement announcement groups

Browse Source
This commit is contained in:
AsamK
2021-08-22 09:55:53 +02:00
parent b745f1f902
commit 610e32aa52
5 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/src/main/java/org/asamk/signal/manager/Manager.java
View File

@@ -809,7 +809,8 @@ public class Manager implements Closeable {
GroupPermission addMemberPermission,
GroupPermission editDetailsPermission,
File avatarFile,
Integer expirationTimer
Integer expirationTimer,
Boolean isAnnouncementGroup
) throws IOException, GroupNotFoundException, AttachmentInvalidException, InvalidNumberException, NotAGroupMemberException {
return updateGroup(groupId,
name,
@@ -823,7 +824,8 @@ public class Manager implements Closeable {
addMemberPermission,
editDetailsPermission,
avatarFile,
expirationTimer);
expirationTimer,
isAnnouncementGroup);
}
private Pair<Long, List<SendMessageResult>> updateGroup(
@@ -839,7 +841,8 @@ public class Manager implements Closeable {
final GroupPermission addMemberPermission,
final GroupPermission editDetailsPermission,
final File avatarFile,
final Integer expirationTimer
final Integer expirationTimer,
final Boolean isAnnouncementGroup
) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException {
var group = getGroupForUpdating(groupId);
@@ -857,7 +860,8 @@ public class Manager implements Closeable {
addMemberPermission,
editDetailsPermission,
avatarFile,
expirationTimer);
expirationTimer,
isAnnouncementGroup);
} catch (ConflictException e) {
// Detected conflicting update, refreshing group and trying again
group = getGroup(groupId, true);
@@ -873,7 +877,8 @@ public class Manager implements Closeable {
addMemberPermission,
editDetailsPermission,
avatarFile,
expirationTimer);
expirationTimer,
isAnnouncementGroup);
}
}
@@ -948,7 +953,8 @@ public class Manager implements Closeable {
final GroupPermission addMemberPermission,
final GroupPermission editDetailsPermission,
final File avatarFile,
Integer expirationTimer
final Integer expirationTimer,
final Boolean isAnnouncementGroup
) throws IOException {
Pair<Long, List<SendMessageResult>> result = null;
if (group.isPendingMember(account.getSelfRecipientId())) {
@@ -1034,6 +1040,11 @@ public class Manager implements Closeable {
result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
}
if (isAnnouncementGroup != null) {
var groupGroupChangePair = groupV2Helper.setIsAnnouncementGroup(group, isAnnouncementGroup);
result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
}
if (name != null || description != null || avatarFile != null) {
var groupGroupChangePair = groupV2Helper.updateGroup(group, name, description, avatarFile);
if (avatarFile != null) {

8
lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
View File

@@ -407,6 +407,14 @@ public class GroupV2Helper {
return commitChange(groupInfoV2, change);
}
public Pair<DecryptedGroup, GroupChange> setIsAnnouncementGroup(
GroupInfoV2 groupInfoV2, boolean isAnnouncementGroup
) throws IOException {
final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
final var change = groupOperations.createAnnouncementGroupChange(isAnnouncementGroup);
return commitChange(groupInfoV2, change);
}
private AccessControl.AccessRequired toAccessControl(final GroupLinkState state) {
switch (state) {
case DISABLED: