Add command to get an attachment (#1080)

[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 a66d0f41a232f441fb3b948d41d3af7a27a3fcbd..c0dc1cf832ac8e68f4b4b06ff050fc1dbbc276d2 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -14,6 +14,9 @@ import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;

+import org.asamk.signal.manager.api.ReceiveConfig;
+import org.asamk.signal.manager.api.Recipient;
+import org.asamk.signal.manager.api.RecipientAddress;

 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResults;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResults;


@@ -33,8 +36,6 @@ import org.asamk.signal.manager.groups.LastGroupAdminException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.storage.recipients.Contact;
 import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.storage.recipients.Contact;
 import org.asamk.signal.manager.storage.recipients.Profile;

-import org.asamk.signal.manager.storage.recipients.Recipient;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;

 import org.freedesktop.dbus.DBusMap;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.DBusMap;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;


@@ -45,6 +46,7 @@ import org.freedesktop.dbus.types.Variant;
 
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;

+import java.io.InputStream;

 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.Duration;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.Duration;


@@ -57,6 +59,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;

+import java.util.concurrent.atomic.AtomicInteger;

 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.function.Supplier;


@@ -363,7 +366,8 @@ public class DbusManagerImpl implements Manager {
             final boolean remove,
             final RecipientIdentifier.Single targetAuthor,
             final long targetSentTimestamp,
             final boolean remove,
             final RecipientIdentifier.Single targetAuthor,
             final long targetSentTimestamp,

-            final Set<RecipientIdentifier> recipients
+            final Set<RecipientIdentifier> recipients,
+            final boolean isStory

     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendMessageReaction(emoji,
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendMessageReaction(emoji,


@@ -387,7 +391,8 @@ public class DbusManagerImpl implements Manager {
     public SendMessageResults sendPaymentNotificationMessage(
             final byte[] receipt, final String note, final RecipientIdentifier.Single recipient
     ) throws IOException {
     public SendMessageResults sendPaymentNotificationMessage(
             final byte[] receipt, final String note, final RecipientIdentifier.Single recipient
     ) throws IOException {

-        throw new UnsupportedOperationException();
+        final var timestamp = signal.sendPaymentNotification(receipt, note, recipient.getIdentifier());
+        return new SendMessageResults(timestamp, Map.of());

     }
 
     @Override
     }
 
     @Override


@@ -408,9 +413,9 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void setContactName(
 
     @Override
     public void setContactName(

-            final RecipientIdentifier.Single recipient, final String name
+            final RecipientIdentifier.Single recipient, final String givenName, final String familyName

     ) throws NotPrimaryDeviceException {
     ) throws NotPrimaryDeviceException {

-        signal.setContactName(recipient.getIdentifier(), name);
+        signal.setContactName(recipient.getIdentifier(), givenName);

     }
 
     @Override
     }
 
     @Override


@@ -494,44 +499,51 @@ public class DbusManagerImpl implements Manager {
         }
     }
 
         }
     }
 

-    @Override
-    public void receiveMessages(final ReceiveMessageHandler handler) throws IOException {
-        addReceiveHandler(handler);
-        try {
-            synchronized (this) {
-                this.wait();
-            }
-        } catch (InterruptedException ignored) {
-        }
-        removeReceiveHandler(handler);
-    }
-

     @Override
     public void receiveMessages(
     @Override
     public void receiveMessages(

-            final Duration timeout, final ReceiveMessageHandler handler
+            Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler

     ) throws IOException {
     ) throws IOException {

+        final var remainingMessages = new AtomicInteger(maxMessages.orElse(-1));

         final var lastMessage = new AtomicLong(System.currentTimeMillis());
         final var lastMessage = new AtomicLong(System.currentTimeMillis());

+        final var thread = Thread.currentThread();

 
         final ReceiveMessageHandler receiveHandler = (envelope, e) -> {
             lastMessage.set(System.currentTimeMillis());
             handler.handleMessage(envelope, e);
 
         final ReceiveMessageHandler receiveHandler = (envelope, e) -> {
             lastMessage.set(System.currentTimeMillis());
             handler.handleMessage(envelope, e);

+            if (remainingMessages.get() > 0) {
+                if (remainingMessages.decrementAndGet() <= 0) {
+                    remainingMessages.set(0);
+                    thread.interrupt();
+                }
+            }

         };
         addReceiveHandler(receiveHandler);
         };
         addReceiveHandler(receiveHandler);

-        while (true) {
+        if (timeout.isPresent()) {
+            while (remainingMessages.get() != 0) {
+                try {
+                    final var passedTime = System.currentTimeMillis() - lastMessage.get();
+                    final var sleepTimeRemaining = timeout.get().toMillis() - passedTime;
+                    if (sleepTimeRemaining < 0) {
+                        break;
+                    }
+                    Thread.sleep(sleepTimeRemaining);
+                } catch (InterruptedException ignored) {
+                }
+            }
+        } else {

             try {
             try {

-                final var sleepTimeRemaining = timeout.toMillis() - (System.currentTimeMillis() - lastMessage.get());
-                if (sleepTimeRemaining < 0) {
-                    break;
+                synchronized (this) {
+                    this.wait();

                 }
                 }

-                Thread.sleep(sleepTimeRemaining);

             } catch (InterruptedException ignored) {
             }
         }
             } catch (InterruptedException ignored) {
             }
         }

+

         removeReceiveHandler(receiveHandler);
     }
 
     @Override
         removeReceiveHandler(receiveHandler);
     }
 
     @Override

-    public void setIgnoreAttachments(final boolean ignoreAttachments) {
+    public void setReceiveConfig(final ReceiveConfig receiveConfig) {

     }
 
     @Override
     }
 
     @Override


@@ -750,12 +762,14 @@ public class DbusManagerImpl implements Manager {
                                         messageReceived.getGroupId()), false, 0))
                                         : Optional.empty(),
                                 Optional.empty(),
                                         messageReceived.getGroupId()), false, 0))
                                         : Optional.empty(),
                                 Optional.empty(),

+                                Optional.empty(),

                                 Optional.of(messageReceived.getMessage()),
                                 0,
                                 false,
                                 false,
                                 false,
                                 false,
                                 Optional.of(messageReceived.getMessage()),
                                 0,
                                 false,
                                 false,
                                 false,
                                 false,

+                                false,

                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),


@@ -766,6 +780,7 @@ public class DbusManagerImpl implements Manager {
                                 List.of(),
                                 List.of())),
                         Optional.empty(),
                                 List.of(),
                                 List.of())),
                         Optional.empty(),

+                        Optional.empty(),

                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };
                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };


@@ -791,6 +806,7 @@ public class DbusManagerImpl implements Manager {
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),

+                        Optional.empty(),

                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };
                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };


@@ -820,12 +836,14 @@ public class DbusManagerImpl implements Manager {
                                                 syncReceived.getGroupId()), false, 0))
                                                 : Optional.empty(),
                                         Optional.empty(),
                                                 syncReceived.getGroupId()), false, 0))
                                                 : Optional.empty(),
                                         Optional.empty(),

+                                        Optional.empty(),

                                         Optional.of(syncReceived.getMessage()),
                                         0,
                                         false,
                                         false,
                                         false,
                                         false,
                                         Optional.of(syncReceived.getMessage()),
                                         0,
                                         false,
                                         false,
                                         false,
                                         false,

+                                        false,

                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),


@@ -834,7 +852,8 @@ public class DbusManagerImpl implements Manager {
                                         Optional.empty(),
                                         List.of(),
                                         List.of(),
                                         Optional.empty(),
                                         List.of(),
                                         List.of(),

-                                        List.of())))),
+                                        List.of())),
+                                Optional.empty())),

                                 Optional.empty(),
                                 List.of(),
                                 List.of(),
                                 Optional.empty(),
                                 List.of(),
                                 List.of(),


@@ -842,6 +861,7 @@ public class DbusManagerImpl implements Manager {
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty())),
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty())),

+                        Optional.empty(),

                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };
                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };


@@ -897,6 +917,11 @@ public class DbusManagerImpl implements Manager {
         }).toList();
     }
 
         }).toList();
     }
 

+    @Override
+    public InputStream retrieveAttachment(final String id) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+

     @SuppressWarnings("unchecked")
     private <T> T getValue(
             final Map<String, Variant<?>> stringVariantMap, final String field
     @SuppressWarnings("unchecked")
     private <T> T getValue(
             final Map<String, Variant<?>> stringVariantMap, final String field