Add possibility to send messages via dbus daemon

[signal-cli] / src / main / java / cli / Manager.java

diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java
index 86850ed46ffa53c7a8fc55043dd749b7177b0c9d..caa3fb5d85c3f523ac5f42f8728eb239e335122a 100644 (file)
--- 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<String> 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())
@@ -367,8 +367,9 @@ class Manager implements TextSecure {
         sendMessage(message, attachments, recipients);
     }
 
+    @Override
     public void sendMessage(String messageText, List<String> attachments,
-                            Collection<String> recipients)
+                            List<String> recipients)
             throws IOException, EncapsulatedExceptions, AttachmentInvalidException {
         final TextSecureDataMessage.Builder messageBuilder = TextSecureDataMessage.newBuilder().withBody(messageText);
         if (attachments != null) {
@@ -379,6 +380,7 @@ class Manager implements TextSecure {
         sendMessage(message, recipients);
     }
 
+    @Override
     public void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions {
         TextSecureDataMessage message = TextSecureDataMessage.newBuilder()
                 .asEndSessionMessage()
@@ -592,14 +594,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;