From a69e8facd2efdfd29bcb128c76573adb62431f1f Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 12 Dec 2015 22:09:51 +0100 Subject: [PATCH] Inline unnecessary methods --- src/main/java/cli/Manager.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java index 86850ed4..3b11d7b4 100644 --- a/src/main/java/cli/Manager.java +++ b/src/main/java/cli/Manager.java @@ -293,7 +293,7 @@ class Manager implements TextSecure { } TextSecureDataMessage message = messageBuilder.build(); - sendMessage(message, getGroupInfo(groupId).members); + sendMessage(message, groupStore.getGroup(groupId).members); } public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions { @@ -305,7 +305,7 @@ class Manager implements TextSecure { .asGroupMessage(group) .build(); - sendMessage(message, getGroupInfo(groupId).members); + sendMessage(message, groupStore.getGroup(groupId).members); } public byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException { @@ -315,7 +315,7 @@ class Manager implements TextSecure { g = new GroupInfo(Util.getSecretBytes(16)); g.members.add(username); } else { - g = getGroupInfo(groupId); + g = groupStore.getGroup(groupId); } if (name != null) { @@ -349,7 +349,7 @@ class Manager implements TextSecure { } } - setGroupInfo(g); + groupStore.updateGroup(g); TextSecureDataMessage message = TextSecureDataMessage.newBuilder() .asGroupMessage(group.build()) @@ -592,14 +592,6 @@ class Manager implements TextSecure { return new TextSecureAddress(e164number); } - private GroupInfo getGroupInfo(byte[] groupId) throws GroupNotFoundException { - return groupStore.getGroup(groupId); - } - - private void setGroupInfo(GroupInfo group) { - groupStore.updateGroup(group); - } - @Override public boolean isRemote() { return false; -- 2.50.1