Merge branch master into dbus_updateConfiguration

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

-import org.asamk.Signal.Error;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+
+import org.freedesktop.dbus.DBusPath;
+import org.freedesktop.dbus.Struct;
+import org.freedesktop.dbus.annotations.DBusProperty;
+import org.freedesktop.dbus.annotations.Position;

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

+import org.freedesktop.dbus.interfaces.Properties;

 import org.freedesktop.dbus.messages.DBusSignal;
 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;
 
 /**


@@ -16,6 +20,8 @@ import java.util.List;
  */
 public interface Signal extends DBusInterface {
 
  */
 public interface Signal extends DBusInterface {
 

+    String getSelfNumber();
+

     long sendMessage(
             String message, List<String> attachments, String recipient
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity;
     long sendMessage(
             String message, List<String> attachments, String recipient
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity;


@@ -29,7 +35,7 @@ public interface Signal extends DBusInterface {
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity;
 
     void sendReadReceipt(
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity;
 
     void sendReadReceipt(

-            String recipient, List<Long> targetSentTimestamp
+            String recipient, List<Long> messageIds

     ) throws Error.Failure, Error.UntrustedIdentity;
 
     long sendRemoteDeleteMessage(
     ) throws Error.Failure, Error.UntrustedIdentity;
 
     long sendRemoteDeleteMessage(


@@ -52,6 +58,10 @@ public interface Signal extends DBusInterface {
             String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, List<String> recipients
     ) throws Error.InvalidNumber, Error.Failure;
 
             String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, List<String> recipients
     ) throws Error.InvalidNumber, Error.Failure;
 

+    void sendContacts() throws Error.Failure;
+
+    void sendSyncRequest() throws Error.Failure;
+

     long sendNoteToSelfMessage(
             String message, List<String> attachments
     ) throws Error.AttachmentInvalid, Error.Failure;
     long sendNoteToSelfMessage(
             String message, List<String> attachments
     ) throws Error.AttachmentInvalid, Error.Failure;


@@ -70,6 +80,8 @@ public interface Signal extends DBusInterface {
 
     void setContactName(String number, String name) throws Error.InvalidNumber;
 
 
     void setContactName(String number, String name) throws Error.InvalidNumber;
 

+    void setExpirationTimer(final String number, final int expiration) throws Error.Failure;
+

     void setContactBlocked(String number, boolean blocked) throws Error.InvalidNumber;
 
     void setGroupBlocked(byte[] groupId, boolean blocked) throws Error.GroupNotFound, Error.InvalidGroupId;
     void setContactBlocked(String number, boolean blocked) throws Error.InvalidNumber;
 
     void setGroupBlocked(byte[] groupId, boolean blocked) throws Error.GroupNotFound, Error.InvalidGroupId;


@@ -84,7 +96,28 @@ public interface Signal extends DBusInterface {
             byte[] groupId, String name, List<String> members, String avatar
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.GroupNotFound, Error.InvalidGroupId;
 
             byte[] groupId, String name, List<String> members, String avatar
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.GroupNotFound, Error.InvalidGroupId;
 

-    boolean isRegistered();
+    boolean isRegistered() throws Error.Failure, Error.InvalidNumber;
+
+    boolean isRegistered(String number) throws Error.Failure, Error.InvalidNumber;
+
+    List<Boolean> isRegistered(List<String> numbers) throws Error.Failure, Error.InvalidNumber;
+
+    void addDevice(String uri) throws Error.InvalidUri;
+
+    DBusPath getDevice(long deviceId);
+
+    List<StructDevice> listDevices() throws Error.Failure;
+
+    DBusPath getThisDevice();
+
+    void updateProfile(
+            String givenName,
+            String familyName,
+            String about,
+            String aboutEmoji,
+            String avatarPath,
+            boolean removeAvatar
+    ) throws Error.Failure;

 
     void updateProfile(
             String name, String about, String aboutEmoji, String avatarPath, boolean removeAvatar
 
     void updateProfile(
             String name, String about, String aboutEmoji, String avatarPath, boolean removeAvatar


@@ -110,6 +143,14 @@ public interface Signal extends DBusInterface {
 
     byte[] joinGroup(final String groupLink) throws Error.Failure;
 
 
     byte[] joinGroup(final String groupLink) throws Error.Failure;
 

+    String uploadStickerPack(String stickerPackPath) throws Error.Failure;
+
+    void setConfiguration(boolean readReceipts, boolean unidentifiedDeliveryIndicators, boolean typingIndicators, boolean linkPreviews) throws Error.IOError, Error.UserError;
+
+    List<Boolean> getConfiguration();
+
+    void submitRateLimitChallenge(String challenge, String captchaString) throws IOErrorException;
+

     class MessageReceived extends DBusSignal {
 
         private final long timestamp;
     class MessageReceived extends DBusSignal {
 
         private final long timestamp;


@@ -227,6 +268,45 @@ public interface Signal extends DBusInterface {
         }
     }
 
         }
     }
 

+    class StructDevice extends Struct {
+
+        @Position(0)
+        DBusPath objectPath;
+
+        @Position(1)
+        Long id;
+
+        @Position(2)
+        String name;
+
+        public StructDevice(final DBusPath objectPath, final Long id, final String name) {
+            this.objectPath = objectPath;
+            this.id = id;
+            this.name = name;
+        }
+
+        public DBusPath getObjectPath() {
+            return objectPath;
+        }
+
+        public Long getId() {
+            return id;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
+    @DBusProperty(name = "Id", type = Long.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "Name", type = String.class)
+    @DBusProperty(name = "Created", type = String.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "LastSeen", type = String.class, access = DBusProperty.Access.READ)
+    interface Device extends DBusInterface, Properties {
+
+        void removeDevice() throws Error.Failure;
+    }
+

     interface Error {
 
         class AttachmentInvalid extends DBusExecutionException {
     interface Error {
 
         class AttachmentInvalid extends DBusExecutionException {


@@ -236,6 +316,13 @@ public interface Signal extends DBusInterface {
             }
         }
 
             }
         }
 

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

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


@@ -270,5 +357,19 @@ public interface Signal extends DBusInterface {
                 super(message);
             }
         }
                 super(message);
             }
         }

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

     }
 }
     }
 }