Don't abort on empty recipient unless there was also no group specified. (#176)

[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 9eb9b4cd516393b99ccd09f473f99b0bc892a7ab..6fb59303aa3e178c3721e11c8ca1fd1e1b2d8359 100644 (file)
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -11,6 +11,7 @@ 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;
 
     void sendMessage(String message, List<String> attachments, List<String> recipients) throws EncapsulatedExceptions, AttachmentInvalidException, IOException;
@@ -23,13 +24,18 @@ public interface Signal extends DBusInterface {
 
     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 {
+
         private long timestamp;
         private String sender;
         private byte[] groupId;
@@ -65,4 +71,24 @@ public interface Signal extends DBusInterface {
             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;
+        }
+    }
 }