]> nmode's Git Repositories - signal-cli/blobdiff - src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
Update man page
[signal-cli] / src / main / java / org / asamk / signal / dbus / DbusSignalImpl.java
index df3f12f27fc9ec429914dfeed04e6e28b92963f3..69747b655bca539f5b7f77ec048bda19d0e7ff57 100644 (file)
@@ -6,7 +6,7 @@ import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
-import org.asamk.signal.storage.groups.GroupInfo;
+import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.util.ErrorUtils;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.libsignal.util.Pair;
@@ -14,9 +14,9 @@ import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -167,7 +167,7 @@ public class DbusSignalImpl implements Signal {
     public List<String> getGroupMembers(final byte[] groupId) {
         GroupInfo group = m.getGroup(GroupId.unknownVersion(groupId));
         if (group == null) {
-            return Collections.emptyList();
+            return List.of();
         } else {
             return group.getMembers()
                     .stream()
@@ -194,7 +194,7 @@ public class DbusSignalImpl implements Signal {
             }
             final Pair<GroupId, List<SendMessageResult>> results = m.updateGroup(groupId == null
                     ? null
-                    : GroupId.unknownVersion(groupId), name, members, avatar);
+                    : GroupId.unknownVersion(groupId), name, members, avatar == null ? null : new File(avatar));
             checkSendMessageResults(0, results.second());
             return results.first().serialize();
         } catch (IOException e) {