add JsonPayment (#808)

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

diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index cc346f7af7ff7ab4b8fd434dfb7c1297b0c0eeb4..d2b1bec754189cb2d1ed919caa060f1810320157 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -6,7 +6,6 @@ import org.asamk.signal.manager.AttachmentInvalidException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.NotMasterDeviceException;
 import org.asamk.signal.manager.StickerPackInvalidException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.NotMasterDeviceException;
 import org.asamk.signal.manager.StickerPackInvalidException;

-import org.asamk.signal.manager.UntrustedIdentityException;

 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
 import org.asamk.signal.manager.api.Group;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
 import org.asamk.signal.manager.api.Group;


@@ -68,6 +67,7 @@ public class DbusManagerImpl implements Manager {
 
     private final Set<ReceiveMessageHandler> weakHandlers = new HashSet<>();
     private final Set<ReceiveMessageHandler> messageHandlers = new HashSet<>();
 
     private final Set<ReceiveMessageHandler> weakHandlers = new HashSet<>();
     private final Set<ReceiveMessageHandler> messageHandlers = new HashSet<>();

+    private final List<Runnable> closedListeners = new ArrayList<>();

     private DBusSigHandler<Signal.MessageReceivedV2> dbusMsgHandler;
     private DBusSigHandler<Signal.ReceiptReceivedV2> dbusRcptHandler;
     private DBusSigHandler<Signal.SyncMessageReceivedV2> dbusSyncHandler;
     private DBusSigHandler<Signal.MessageReceivedV2> dbusMsgHandler;
     private DBusSigHandler<Signal.ReceiptReceivedV2> dbusRcptHandler;
     private DBusSigHandler<Signal.SyncMessageReceivedV2> dbusSyncHandler;


@@ -297,31 +297,34 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public void sendTypingMessage(
+    public SendMessageResults sendTypingMessage(

             final TypingAction action, final Set<RecipientIdentifier> recipients
             final TypingAction action, final Set<RecipientIdentifier> recipients

-    ) throws IOException, UntrustedIdentityException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
-        for (final var recipient : recipients) {
-            if (recipient instanceof RecipientIdentifier.Single) {
-                signal.sendTyping(((RecipientIdentifier.Single) recipient).getIdentifier(),
-                        action == TypingAction.STOP);
-            } else if (recipient instanceof RecipientIdentifier.Group) {
-                throw new UnsupportedOperationException();
-            }
-        }
+    ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+        return handleMessage(recipients, numbers -> {
+            numbers.forEach(n -> signal.sendTyping(n, action == TypingAction.STOP));
+            return 0L;
+        }, () -> {
+            signal.sendTyping(signal.getSelfNumber(), action == TypingAction.STOP);
+            return 0L;
+        }, groupId -> {
+            throw new UnsupportedOperationException();
+        });

     }
 
     @Override
     }
 
     @Override

-    public void sendReadReceipt(
+    public SendMessageResults sendReadReceipt(

             final RecipientIdentifier.Single sender, final List<Long> messageIds
             final RecipientIdentifier.Single sender, final List<Long> messageIds

-    ) throws IOException, UntrustedIdentityException {
+    ) {

         signal.sendReadReceipt(sender.getIdentifier(), messageIds);
         signal.sendReadReceipt(sender.getIdentifier(), messageIds);

+        return new SendMessageResults(0, Map.of());

     }
 
     @Override
     }
 
     @Override

-    public void sendViewedReceipt(
+    public SendMessageResults sendViewedReceipt(

             final RecipientIdentifier.Single sender, final List<Long> messageIds
             final RecipientIdentifier.Single sender, final List<Long> messageIds

-    ) throws IOException, UntrustedIdentityException {
+    ) {

         signal.sendViewedReceipt(sender.getIdentifier(), messageIds);
         signal.sendViewedReceipt(sender.getIdentifier(), messageIds);

+        return new SendMessageResults(0, Map.of());

     }
 
     @Override
     }
 
     @Override


@@ -583,6 +586,13 @@ public class DbusManagerImpl implements Manager {
         throw new UnsupportedOperationException();
     }
 
         throw new UnsupportedOperationException();
     }
 

+    @Override
+    public void addClosedListener(final Runnable listener) {
+        synchronized (closedListeners) {
+            closedListeners.add(listener);
+        }
+    }
+

     @Override
     public void close() throws IOException {
         synchronized (this) {
     @Override
     public void close() throws IOException {
         synchronized (this) {


@@ -595,6 +605,10 @@ public class DbusManagerImpl implements Manager {
             weakHandlers.clear();
             messageHandlers.clear();
         }
             weakHandlers.clear();
             messageHandlers.clear();
         }

+        synchronized (closedListeners) {
+            closedListeners.forEach(Runnable::run);
+            closedListeners.clear();
+        }

     }
 
     private SendMessageResults handleMessage(
     }
 
     private SendMessageResults handleMessage(


@@ -666,6 +680,7 @@ public class DbusManagerImpl implements Manager {
                                 false,
                                 Optional.empty(),
                                 Optional.empty(),
                                 false,
                                 Optional.empty(),
                                 Optional.empty(),

+                                Optional.empty(),

                                 getAttachments(extras),
                                 Optional.empty(),
                                 Optional.empty(),
                                 getAttachments(extras),
                                 Optional.empty(),
                                 Optional.empty(),


@@ -735,6 +750,7 @@ public class DbusManagerImpl implements Manager {
                                         false,
                                         Optional.empty(),
                                         Optional.empty(),
                                         false,
                                         Optional.empty(),
                                         Optional.empty(),

+                                        Optional.empty(),

                                         getAttachments(extras),
                                         Optional.empty(),
                                         Optional.empty(),
                                         getAttachments(extras),
                                         Optional.empty(),
                                         Optional.empty(),