Implement Dbus setPin and removePin (#733)

[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 6e76f4a7bcab6be7a247db08c8a6a6dd1f671fb4..a30f8f3b2f5e3560618172758eff9effa08a0931 100644 (file)
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -1,10 +1,13 @@
 package org.asamk;
 
 package org.asamk;
 

+import org.asamk.Signal.Error;

 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.freedesktop.dbus.interfaces.DBusInterface;
 import org.freedesktop.dbus.messages.DBusSignal;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.freedesktop.dbus.interfaces.DBusInterface;
 import org.freedesktop.dbus.messages.DBusSignal;

+import org.whispersystems.libsignal.util.guava.Optional;

 
 

+import java.io.IOException;

 import java.util.List;
 
 /**
 import java.util.List;
 
 /**


@@ -21,6 +24,26 @@ public interface Signal extends DBusInterface {
             String message, List<String> attachments, List<String> recipients
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity;
 
             String message, List<String> attachments, List<String> recipients
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity;
 

+    void sendTyping(
+            String recipient, boolean stop
+    ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity;
+
+    void sendReadReceipt(
+            String recipient, List<Long> targetSentTimestamp
+    ) throws Error.Failure, Error.UntrustedIdentity;
+
+    long sendRemoteDeleteMessage(
+            long targetSentTimestamp, String recipient
+    ) throws Error.Failure, Error.InvalidNumber;
+
+    long sendRemoteDeleteMessage(
+            long targetSentTimestamp, List<String> recipients
+    ) throws Error.Failure, Error.InvalidNumber;
+
+    long sendGroupRemoteDeleteMessage(
+            long targetSentTimestamp, byte[] groupId
+    ) throws Error.Failure, Error.GroupNotFound, Error.InvalidGroupId;
+

     long sendMessageReaction(
             String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, String recipient
     ) throws Error.InvalidNumber, Error.Failure;
     long sendMessageReaction(
             String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, String recipient
     ) throws Error.InvalidNumber, Error.Failure;


@@ -37,11 +60,11 @@ public interface Signal extends DBusInterface {
 
     long sendGroupMessage(
             String message, List<String> attachments, byte[] groupId
 
     long sendGroupMessage(
             String message, List<String> attachments, byte[] groupId

-    ) throws Error.GroupNotFound, Error.Failure, Error.AttachmentInvalid;
+    ) throws Error.GroupNotFound, Error.Failure, Error.AttachmentInvalid, Error.InvalidGroupId;

 
     long sendGroupMessageReaction(
             String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, byte[] groupId
 
     long sendGroupMessageReaction(
             String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, byte[] groupId

-    ) throws Error.GroupNotFound, Error.Failure, Error.InvalidNumber;
+    ) throws Error.GroupNotFound, Error.Failure, Error.InvalidNumber, Error.InvalidGroupId;

 
     String getContactName(String number) throws Error.InvalidNumber;
 
 
     String getContactName(String number) throws Error.InvalidNumber;
 


@@ -49,17 +72,17 @@ public interface Signal extends DBusInterface {
 
     void setContactBlocked(String number, boolean blocked) throws Error.InvalidNumber;
 
 
     void setContactBlocked(String number, boolean blocked) throws Error.InvalidNumber;
 

-    void setGroupBlocked(byte[] groupId, boolean blocked) throws Error.GroupNotFound;
+    void setGroupBlocked(byte[] groupId, boolean blocked) throws Error.GroupNotFound, Error.InvalidGroupId;

 
     List<byte[]> getGroupIds();
 
 
     List<byte[]> getGroupIds();
 

-    String getGroupName(byte[] groupId);
+    String getGroupName(byte[] groupId) throws Error.InvalidGroupId;

 
 

-    List<String> getGroupMembers(byte[] groupId);
+    List<String> getGroupMembers(byte[] groupId) throws Error.InvalidGroupId;

 
     byte[] updateGroup(
             byte[] groupId, String name, List<String> members, String avatar
 
     byte[] updateGroup(
             byte[] groupId, String name, List<String> members, String avatar

-    ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.GroupNotFound;
+    ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.GroupNotFound, Error.InvalidGroupId;

 
     boolean isRegistered();
 
 
     boolean isRegistered();
 


@@ -67,21 +90,25 @@ public interface Signal extends DBusInterface {
             String name, String about, String aboutEmoji, String avatarPath, boolean removeAvatar
     ) throws Error.Failure;
 
             String name, String about, String aboutEmoji, String avatarPath, boolean removeAvatar
     ) throws Error.Failure;
 

-    public String version();
+    void removePin();
+
+    void setPin(String registrationLockPin);

 
 

-    public List<String> listNumbers();
+    String version();

 
 

-    public List<String> getContactNumber(final String name) throws Error.Failure;
+    List<String> listNumbers();

 
 

-    public void quitGroup(final byte[] groupId) throws Error.GroupNotFound, Error.Failure;
+    List<String> getContactNumber(final String name) throws Error.Failure;

 
 

-    public boolean isContactBlocked(final String number);
+    void quitGroup(final byte[] groupId) throws Error.GroupNotFound, Error.Failure, Error.InvalidGroupId;

 
 

-    public boolean isGroupBlocked(final byte[] groupId);
+    boolean isContactBlocked(final String number) throws Error.InvalidNumber;

 
 

-    public boolean isMember(final byte[] groupId);
+    boolean isGroupBlocked(final byte[] groupId) throws Error.InvalidGroupId;

 
 

-    public void joinGroup(final String groupLink) throws Error.Failure;
+    boolean isMember(final byte[] groupId) throws Error.InvalidGroupId;
+
+    byte[] joinGroup(final String groupLink) throws Error.Failure;

 
     class MessageReceived extends DBusSignal {
 
 
     class MessageReceived extends DBusSignal {
 


@@ -223,6 +250,13 @@ public interface Signal extends DBusInterface {
             }
         }
 
             }
         }
 

+        class InvalidGroupId extends DBusExecutionException {
+
+            public InvalidGroupId(final String message) {
+                super(message);
+            }
+        }
+

         class InvalidNumber extends DBusExecutionException {
 
             public InvalidNumber(final String message) {
         class InvalidNumber extends DBusExecutionException {
 
             public InvalidNumber(final String message) {