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

Replace switch with if

Browse source
This commit is contained in:
ahatius 2023-12-04 20:04:14 +01:00 • committed by GitHub
parent d4321971e3
commit 1adfd3d6cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

90
lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
View file

@ -209,54 +209,52 @@ public class GroupHelper {
var group = getGroupForUpdating(groupId);
final var avatarBytes = readAvatarBytes(avatarFile);
switch (group) {
case GroupInfoV2 gv2 -> {
try {
return updateGroupV2(gv2,
name,
description,
members,
removeMembers,
admins,
removeAdmins,
banMembers,
unbanMembers,
resetGroupLink,
groupLinkState,
addMemberPermission,
editDetailsPermission,
avatarBytes,
expirationTimer,
isAnnouncementGroup);
} catch (ConflictException e) {
// Detected conflicting update, refreshing group and trying again
group = getGroup(groupId, true);
return updateGroupV2((GroupInfoV2) group,
name,
description,
members,
removeMembers,
admins,
removeAdmins,
banMembers,
unbanMembers,
resetGroupLink,
groupLinkState,
addMemberPermission,
editDetailsPermission,
avatarBytes,
expirationTimer,
isAnnouncementGroup);
}
if(group instanceof GroupInfoV2) {
GroupInfoV2 gv2 = (GroupInfoV2) group;
try {
return updateGroupV2(gv2,
name,
description,
members,
removeMembers,
admins,
removeAdmins,
banMembers,
unbanMembers,
resetGroupLink,
groupLinkState,
addMemberPermission,
editDetailsPermission,
avatarBytes,
expirationTimer,
isAnnouncementGroup);
} catch (ConflictException e) {
// Detected conflicting update, refreshing group and trying again
group = getGroup(groupId, true);
return updateGroupV2((GroupInfoV2) group,
name,
description,
members,
removeMembers,
admins,
removeAdmins,
banMembers,
unbanMembers,
resetGroupLink,
groupLinkState,
addMemberPermission,
editDetailsPermission,
avatarBytes,
expirationTimer,
isAnnouncementGroup);
}
case GroupInfoV1 gv1 -> {
final var result = updateGroupV1(gv1, name, members, avatarBytes);
if (expirationTimer != null) {
setExpirationTimer(gv1, expirationTimer);
}
return result;
} else if (group instanceof GroupInfoV1) {
GroupInfoV1 gv1 = (GroupInfoV1) group;
final var result = updateGroupV1(gv1, name, members, avatarBytes);
if (expirationTimer != null) {
setExpirationTimer(gv1, expirationTimer);
}
return result;
}
}