Split commands into separate classes

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

diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index e115bb7c0d03b8832c8971d8fa44548236a7fbac..6fb59303aa3e178c3721e11c8ca1fd1e1b2d8359 100644 (file)
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -5,22 +5,37 @@ import org.asamk.signal.GroupNotFoundException;
 import org.freedesktop.dbus.DBusInterface;
 import org.freedesktop.dbus.DBusSignal;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.DBusInterface;
 import org.freedesktop.dbus.DBusSignal;
 import org.freedesktop.dbus.exceptions.DBusException;

-import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;

 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
 
 import java.io.IOException;
 import java.util.List;
 
 public interface Signal extends DBusInterface {
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
 
 import java.io.IOException;
 import java.util.List;
 
 public interface Signal extends DBusInterface {

-    void sendMessage(String message, List<String> attachments, String recipient) throws EncapsulatedExceptions, AttachmentInvalidException, IOException, UntrustedIdentityException;

 
 

-    void sendMessage(String message, List<String> attachments, List<String> recipients) throws EncapsulatedExceptions, AttachmentInvalidException, IOException, UntrustedIdentityException;
+    void sendMessage(String message, List<String> attachments, String recipient) throws EncapsulatedExceptions, AttachmentInvalidException, IOException;

 
 

-    void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions, UntrustedIdentityException;
+    void sendMessage(String message, List<String> attachments, List<String> recipients) throws EncapsulatedExceptions, AttachmentInvalidException, IOException;

 
 

-    void sendGroupMessage(String message, List<String> attachments, byte[] groupId) throws EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, IOException, UntrustedIdentityException;
+    void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions;
+
+    void sendGroupMessage(String message, List<String> attachments, byte[] groupId) throws EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, IOException;
+
+    String getContactName(String number);
+
+    void setContactName(String number, String name);
+
+    List<byte[]> getGroupIds();
+
+    String getGroupName(byte[] groupId);
+
+    List<String> getGroupMembers(byte[] groupId);
+
+    byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException;
+
+    boolean isRegistered();

 
     class MessageReceived extends DBusSignal {
 
     class MessageReceived extends DBusSignal {

+

         private long timestamp;
         private String sender;
         private byte[] groupId;
         private long timestamp;
         private String sender;
         private byte[] groupId;


@@ -56,4 +71,24 @@ public interface Signal extends DBusInterface {
             return attachments;
         }
     }
             return attachments;
         }
     }

+
+    class ReceiptReceived extends DBusSignal {
+
+        private long timestamp;
+        private String sender;
+
+        public ReceiptReceived(String objectpath, long timestamp, String sender) throws DBusException {
+            super(objectpath, timestamp, sender);
+            this.timestamp = timestamp;
+            this.sender = sender;
+        }
+
+        public long getTimestamp() {
+            return timestamp;
+        }
+
+        public String getSender() {
+            return sender;
+        }
+    }

 }
 }