From 06ea285d14032d21db86b99cec44b39b15931d3d Mon Sep 17 00:00:00 2001 From: david-harley Date: Thu, 7 Jan 2021 15:22:13 +1030 Subject: [PATCH] Renamed classes --- .../signal/commands/ListGroupsCommand.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java index 5fb1bee6..5493441c 100644 --- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java @@ -110,11 +110,11 @@ public class ListGroupsCommand implements LocalCommand { jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET); if (detailed) { - List objects = new ArrayList<>(); + List objects = new ArrayList<>(); for (GroupInfo group : groups) { final GroupInviteLinkUrl groupInviteLink = group.getGroupInviteLink(); - objects.add(new JsonListGroupDetailed(group.getGroupId().toBase64(), + objects.add(new JsonGroupDetailed(group.getGroupId().toBase64(), group.getTitle(), group.isMember(m.getSelfAddress()), group.isBlocked(), @@ -126,8 +126,8 @@ public class ListGroupsCommand implements LocalCommand { return printGroupsJson(jsonProcessor, objects); } else { - List objects = groups.stream().map( - group -> new JsonListGroup(group.getGroupId().toBase64(), + List objects = groups.stream().map( + group -> new JsonGroup(group.getGroupId().toBase64(), group.getTitle(), group.isMember(m.getSelfAddress()), group.isBlocked())) @@ -144,14 +144,14 @@ public class ListGroupsCommand implements LocalCommand { return 0; } - private static final class JsonListGroup { + private static final class JsonGroup { public String id; public String name; public boolean isMember; public boolean isBlocked; - public JsonListGroup(String id, String name, boolean isMember, boolean isBlocked) { + public JsonGroup(String id, String name, boolean isMember, boolean isBlocked) { this.id = id; this.name = name; this.isMember = isMember; @@ -159,7 +159,7 @@ public class ListGroupsCommand implements LocalCommand { } } - private static final class JsonListGroupDetailed { + private static final class JsonGroupDetailed { public String id; public String name; @@ -171,9 +171,9 @@ public class ListGroupsCommand implements LocalCommand { public Set requestingMembers; public String groupInviteLink; - public JsonListGroupDetailed(String id, String name, boolean isMember, boolean isBlocked, - Set members, Set pendingMembers, - Set requestingMembers, String groupInviteLink) + public JsonGroupDetailed(String id, String name, boolean isMember, boolean isBlocked, + Set members, Set pendingMembers, + Set requestingMembers, String groupInviteLink) { this.id = id; this.name = name;