Adapt receive subscription notification to have payload in result field

[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 bc8bf74e47cfeea0b074259ea99588fe582f621b..9bffd6afd92016cf7c5d22435bd6e11fefc204a4 100644 (file)
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -138,6 +138,10 @@ public interface Signal extends DBusInterface {
 
     DBusPath getDevice(long deviceId);
 
 
     DBusPath getDevice(long deviceId);
 

+    public DBusPath getIdentity(String number);
+
+    public List<StructIdentity> listIdentities();
+

     List<StructDevice> listDevices() throws Error.Failure;
 
     DBusPath getThisDevice();
     List<StructDevice> listDevices() throws Error.Failure;
 
     DBusPath getThisDevice();


@@ -551,6 +555,50 @@ public interface Signal extends DBusInterface {
         void enableLink(boolean requiresApproval) throws Error.Failure;
     }
 
         void enableLink(boolean requiresApproval) throws Error.Failure;
     }
 

+    class StructIdentity extends Struct {
+
+        @Position(0)
+        DBusPath objectPath;
+
+        @Position(1)
+        String uuid;
+
+        @Position(2)
+        String number;
+
+        public StructIdentity(final DBusPath objectPath, final String uuid, final String number) {
+            this.objectPath = objectPath;
+            this.uuid = uuid;
+            this.number = number;
+        }
+
+        public DBusPath getObjectPath() {
+            return objectPath;
+        }
+
+        public String getUuid() {
+            return uuid;
+        }
+
+        public String getNumber() {
+            return number;
+        }
+    }
+
+    @DBusProperty(name = "Number", type = String.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "Uuid", type = String.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "Fingerprint", type = Byte[].class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "SafetyNumber", type = String.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "TrustLevel", type = String.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "AddedDate", type = Integer.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "ScannableSafetyNumber", type = Byte[].class, access = DBusProperty.Access.READ)
+    interface Identity extends DBusInterface, Properties {
+
+        void trust() throws Error.Failure;
+
+        void trustVerified(String safetyNumber) throws Error.Failure;
+    }
+

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