Create an AvatarStore

[signal-cli] / src / main / java / org / asamk / signal / manager / helper / GroupHelper.java

diff --git a/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 5a88bc667b3f08858cfec080a5573d46b51ec414..d39da8a3fa20b10cbaaf8dc8bb269b8e7706d746 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -2,12 +2,12 @@ package org.asamk.signal.manager.helper;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 
-import org.asamk.signal.manager.GroupIdV2;
-import org.asamk.signal.manager.GroupLinkPassword;
-import org.asamk.signal.manager.GroupUtils;
-import org.asamk.signal.storage.groups.GroupInfoV2;
-import org.asamk.signal.storage.profiles.SignalProfile;
-import org.asamk.signal.util.IOUtils;
+import org.asamk.signal.manager.groups.GroupIdV2;
+import org.asamk.signal.manager.groups.GroupLinkPassword;
+import org.asamk.signal.manager.groups.GroupUtils;
+import org.asamk.signal.manager.storage.groups.GroupInfoV2;
+import org.asamk.signal.manager.storage.profiles.SignalProfile;
+import org.asamk.signal.manager.util.IOUtils;
 import org.signal.storageservice.protos.groups.AccessControl;
 import org.signal.storageservice.protos.groups.GroupChange;
 import org.signal.storageservice.protos.groups.Member;
@@ -36,6 +36,7 @@ import org.whispersystems.signalservice.api.groupsv2.NotAbleToApplyGroupV2Change
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -47,7 +48,7 @@ import java.util.stream.Collectors;
 
 public class GroupHelper {
 
-    final static Logger logger = LoggerFactory.getLogger(GroupHelper.class);
+    private final static Logger logger = LoggerFactory.getLogger(GroupHelper.class);
 
     private final ProfileKeyCredentialProvider profileKeyCredentialProvider;
 
@@ -99,7 +100,7 @@ public class GroupHelper {
     }
 
     public GroupInfoV2 createGroupV2(
-            String name, Collection<SignalServiceAddress> members, String avatarFile
+            String name, Collection<SignalServiceAddress> members, File avatarFile
     ) throws IOException {
         final byte[] avatarBytes = readAvatarBytes(avatarFile);
         final GroupsV2Operations.NewGroup newGroup = buildNewGroupV2(name, members, avatarBytes);
@@ -132,7 +133,7 @@ public class GroupHelper {
         return g;
     }
 
-    private byte[] readAvatarBytes(final String avatarFile) throws IOException {
+    private byte[] readAvatarBytes(final File avatarFile) throws IOException {
         final byte[] avatarBytes;
         try (InputStream avatar = avatarFile == null ? null : new FileInputStream(avatarFile)) {
             avatarBytes = avatar == null ? null : IOUtils.readFully(avatar);
@@ -194,7 +195,7 @@ public class GroupHelper {
     }
 
     public Pair<DecryptedGroup, GroupChange> updateGroupV2(
-            GroupInfoV2 groupInfoV2, String name, String avatarFile
+            GroupInfoV2 groupInfoV2, String name, File avatarFile
     ) throws IOException {
         final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
         GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(groupSecretParams);