Move storage package to manager

[signal-cli] / src / main / java / org / asamk / signal / dbus / DbusSignalImpl.java

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index bffde498244c53f765c101483fc4ea2860ca5cb9..d19116a4b126348e04f6e9fa1a1eb3cad0e30ad4 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -2,20 +2,23 @@ package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.AttachmentInvalidException;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.AttachmentInvalidException;

-import org.asamk.signal.manager.GroupNotFoundException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.NotAGroupMemberException;
-import org.asamk.signal.storage.groups.GroupInfo;
+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.manager.storage.groups.GroupInfo;

 import org.asamk.signal.util.ErrorUtils;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.asamk.signal.util.ErrorUtils;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;

+import org.whispersystems.signalservice.api.push.SignalServiceAddress;

 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

+import java.util.stream.Collectors;

 
 public class DbusSignalImpl implements Signal {
 
 
 public class DbusSignalImpl implements Signal {
 


@@ -42,7 +45,9 @@ public class DbusSignalImpl implements Signal {
         return sendMessage(message, attachments, recipients);
     }
 
         return sendMessage(message, attachments, recipients);
     }
 

-    private static void checkSendMessageResults(long timestamp, List<SendMessageResult> results) throws DBusExecutionException {
+    private static void checkSendMessageResults(
+            long timestamp, List<SendMessageResult> results
+    ) throws DBusExecutionException {

         List<String> errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
         if (errors.size() == 0) {
             return;
         List<String> errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
         if (errors.size() == 0) {
             return;


@@ -88,7 +93,9 @@ public class DbusSignalImpl implements Signal {
     @Override
     public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
         try {
     @Override
     public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
         try {

-            Pair<Long, List<SendMessageResult>> results = m.sendGroupMessage(message, attachments, groupId);
+            Pair<Long, List<SendMessageResult>> results = m.sendGroupMessage(message,
+                    attachments,
+                    GroupId.unknownVersion(groupId));

             checkSendMessageResults(results.first(), results.second());
             return results.first();
         } catch (IOException e) {
             checkSendMessageResults(results.first(), results.second());
             return results.first();
         } catch (IOException e) {


@@ -130,7 +137,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
         try {
     @Override
     public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
         try {

-            m.setGroupBlocked(groupId, blocked);
+            m.setGroupBlocked(GroupId.unknownVersion(groupId), blocked);

         } catch (GroupNotFoundException e) {
             throw new Error.GroupNotFound(e.getMessage());
         }
         } catch (GroupNotFoundException e) {
             throw new Error.GroupNotFound(e.getMessage());
         }


@@ -141,37 +148,55 @@ public class DbusSignalImpl implements Signal {
         List<GroupInfo> groups = m.getGroups();
         List<byte[]> ids = new ArrayList<>(groups.size());
         for (GroupInfo group : groups) {
         List<GroupInfo> groups = m.getGroups();
         List<byte[]> ids = new ArrayList<>(groups.size());
         for (GroupInfo group : groups) {

-            ids.add(group.groupId);
+            ids.add(group.getGroupId().serialize());

         }
         return ids;
     }
 
     @Override
     public String getGroupName(final byte[] groupId) {
         }
         return ids;
     }
 
     @Override
     public String getGroupName(final byte[] groupId) {

-        GroupInfo group = m.getGroup(groupId);
+        GroupInfo group = m.getGroup(GroupId.unknownVersion(groupId));

         if (group == null) {
             return "";
         } else {
         if (group == null) {
             return "";
         } else {

-            return group.name;
+            return group.getTitle();

         }
     }
 
     @Override
     public List<String> getGroupMembers(final byte[] groupId) {
         }
     }
 
     @Override
     public List<String> getGroupMembers(final byte[] groupId) {

-        GroupInfo group = m.getGroup(groupId);
+        GroupInfo group = m.getGroup(GroupId.unknownVersion(groupId));

         if (group == null) {
             return Collections.emptyList();
         } else {
         if (group == null) {
             return Collections.emptyList();
         } else {

-            return new ArrayList<>(group.getMembersE164());
+            return group.getMembers()
+                    .stream()
+                    .map(m::resolveSignalServiceAddress)
+                    .map(SignalServiceAddress::getLegacyIdentifier)
+                    .collect(Collectors.toList());

         }
     }
 
     @Override
         }
     }
 
     @Override

-    public byte[] updateGroup(final byte[] groupId, final String name, final List<String> members, final String avatar) {
+    public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) {

         try {
         try {

-            final Pair<byte[], List<SendMessageResult>> results = m.updateGroup(groupId, name, members, avatar);
+            if (groupId.length == 0) {
+                groupId = null;
+            }
+            if (name.isEmpty()) {
+                name = null;
+            }
+            if (members.isEmpty()) {
+                members = null;
+            }
+            if (avatar.isEmpty()) {
+                avatar = null;
+            }
+            final Pair<GroupId, List<SendMessageResult>> results = m.updateGroup(groupId == null
+                    ? null
+                    : GroupId.unknownVersion(groupId), name, members, avatar);

             checkSendMessageResults(0, results.second());
             checkSendMessageResults(0, results.second());

-            return results.first();
+            return results.first().serialize();

         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         } catch (GroupNotFoundException | NotAGroupMemberException e) {
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         } catch (GroupNotFoundException | NotAGroupMemberException e) {