X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/2a20e70aabaad0106774157a78eba60428604ac1..a7db3a5610db2cf718030fbe06e5ebb8531459c8:/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java index 411ae747..1f7825fb 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java @@ -9,15 +9,15 @@ import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.AttachmentInvalidException; +import org.asamk.signal.manager.api.GroupId; +import org.asamk.signal.manager.api.GroupLinkState; +import org.asamk.signal.manager.api.GroupNotFoundException; +import org.asamk.signal.manager.api.GroupPermission; +import org.asamk.signal.manager.api.GroupSendingNotAllowedException; +import org.asamk.signal.manager.api.NotAGroupMemberException; import org.asamk.signal.manager.api.SendGroupMessageResults; import org.asamk.signal.manager.api.UnregisteredRecipientException; import org.asamk.signal.manager.api.UpdateGroup; -import org.asamk.signal.manager.groups.GroupId; -import org.asamk.signal.manager.groups.GroupLinkState; -import org.asamk.signal.manager.groups.GroupNotFoundException; -import org.asamk.signal.manager.groups.GroupPermission; -import org.asamk.signal.manager.groups.GroupSendingNotAllowedException; -import org.asamk.signal.manager.groups.NotAGroupMemberException; import org.asamk.signal.output.JsonWriter; import org.asamk.signal.output.OutputWriter; import org.asamk.signal.output.PlainTextWriter; @@ -26,7 +26,6 @@ import org.asamk.signal.util.SendMessageResultUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; import java.io.IOException; import java.util.HashMap; import java.util.stream.Stream; @@ -131,9 +130,7 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { SendGroupMessageResults groupMessageResults = null; if (groupId == null) { isNewGroup = true; - var results = m.createGroup(groupName, - groupMembers, - groupAvatar == null ? null : new File(groupAvatar)); + var results = m.createGroup(groupName, groupMembers, groupAvatar); groupMessageResults = results.second(); groupId = results.first(); groupName = null; @@ -155,7 +152,7 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { .withGroupLinkState(groupLinkState) .withAddMemberPermission(groupAddMemberPermission) .withEditDetailsPermission(groupEditDetailsPermission) - .withAvatarFile(groupAvatar == null ? null : new File(groupAvatar)) + .withAvatarFile(groupAvatar) .withExpirationTimer(groupExpiration) .withIsAnnouncementGroup(groupSendMessagesPermission == null ? null