Refactor addDeviceLink method

[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 6bb93677f15e030c5a836aecdcd51821416015a4..2871ad5d82e2d44ff6bce61fe8ac3e872043f1ab 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -5,15 +5,29 @@ import org.asamk.signal.DbusConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.Configuration;

+import org.asamk.signal.manager.api.Contact;

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

+import org.asamk.signal.manager.api.DeviceLinkUrl;

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

+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;

 import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;

+import org.asamk.signal.manager.api.InvalidStickerException;
+import org.asamk.signal.manager.api.InvalidUsernameException;
+import org.asamk.signal.manager.api.LastGroupAdminException;

 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;

-import org.asamk.signal.manager.api.NotMasterDeviceException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;

 import org.asamk.signal.manager.api.Pair;
 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;


@@ -21,19 +35,10 @@ import org.asamk.signal.manager.api.StickerPack;
 import org.asamk.signal.manager.api.StickerPackInvalidException;
 import org.asamk.signal.manager.api.StickerPackUrl;
 import org.asamk.signal.manager.api.TypingAction;
 import org.asamk.signal.manager.api.StickerPackInvalidException;
 import org.asamk.signal.manager.api.StickerPackUrl;
 import org.asamk.signal.manager.api.TypingAction;

+import org.asamk.signal.manager.api.UnregisteredRecipientException;

 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateGroup;

+import org.asamk.signal.manager.api.UpdateProfile;

 import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.api.UserStatus;

-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupPermission;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-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.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;


@@ -44,6 +49,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;


@@ -56,6 +62,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;


@@ -138,19 +145,23 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public void setProfile(
-            final String givenName,
-            final String familyName,
-            final String about,
-            final String aboutEmoji,
-            final Optional<File> avatar
-    ) throws IOException {
-        signal.updateProfile(emptyIfNull(givenName),
-                emptyIfNull(familyName),
-                emptyIfNull(about),
-                emptyIfNull(aboutEmoji),
-                avatar == null ? "" : avatar.map(File::getPath).orElse(""),
-                avatar != null && avatar.isEmpty());
+    public void updateProfile(UpdateProfile updateProfile) throws IOException {
+        signal.updateProfile(emptyIfNull(updateProfile.getGivenName()),
+                emptyIfNull(updateProfile.getFamilyName()),
+                emptyIfNull(updateProfile.getAbout()),
+                emptyIfNull(updateProfile.getAboutEmoji()),
+                updateProfile.getAvatar() == null ? "" : updateProfile.getAvatar(),
+                updateProfile.isDeleteAvatar());
+    }
+
+    @Override
+    public String setUsername(final String username) throws IOException, InvalidUsernameException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void deleteUsername() throws IOException {
+        throw new UnsupportedOperationException();

     }
 
     @Override
     }
 
     @Override


@@ -189,8 +200,8 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public void addDeviceLink(final URI linkUri) throws IOException, InvalidDeviceLinkException {
-        signal.addDevice(linkUri.toString());
+    public void addDeviceLink(final DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException {
+        signal.addDevice(linkUri.createDeviceLinkUri().toString());

     }
 
     @Override
     }
 
     @Override


@@ -202,11 +213,6 @@ public class DbusManagerImpl implements Manager {
         }
     }
 
         }
     }
 

-    @Override
-    public Profile getRecipientProfile(final RecipientIdentifier.Single recipient) {
-        throw new UnsupportedOperationException();
-    }
-

     @Override
     public List<Group> getGroups() {
         final var groups = signal.listGroups();
     @Override
     public List<Group> getGroups() {
         final var groups = signal.listGroups();


@@ -221,7 +227,15 @@ public class DbusManagerImpl implements Manager {
             throw new UnsupportedOperationException();
         }
         final var group = getRemoteObject(signal.getGroup(groupId.serialize()), Signal.Group.class);
             throw new UnsupportedOperationException();
         }
         final var group = getRemoteObject(signal.getGroup(groupId.serialize()), Signal.Group.class);

-        group.quitGroup();
+        try {
+            group.quitGroup();
+        } catch (Signal.Error.GroupNotFound e) {
+            throw new GroupNotFoundException(groupId);
+        } catch (Signal.Error.NotAGroupMember e) {
+            throw new NotAGroupMemberException(groupId, group.Get("org.asamk.Signal.Group", "Name"));
+        } catch (Signal.Error.LastGroupAdmin e) {
+            throw new LastGroupAdminException(groupId, group.Get("org.asamk.Signal.Group", "Name"));
+        }

         return new SendGroupMessageResults(0, List.of());
     }
 
         return new SendGroupMessageResults(0, List.of());
     }
 


@@ -233,11 +247,11 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> createGroup(
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> createGroup(

-            final String name, final Set<RecipientIdentifier.Single> members, final File avatarFile
+            final String name, final Set<RecipientIdentifier.Single> members, final String avatarFile

     ) throws IOException, AttachmentInvalidException {
         final var newGroupId = signal.createGroup(emptyIfNull(name),
                 members.stream().map(RecipientIdentifier.Single::getIdentifier).toList(),
     ) throws IOException, AttachmentInvalidException {
         final var newGroupId = signal.createGroup(emptyIfNull(name),
                 members.stream().map(RecipientIdentifier.Single::getIdentifier).toList(),

-                avatarFile == null ? "" : avatarFile.getPath());
+                avatarFile == null ? "" : avatarFile);

         return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
     }
 
         return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
     }
 


@@ -255,7 +269,7 @@ public class DbusManagerImpl implements Manager {
         if (updateGroup.getAvatarFile() != null) {
             group.Set("org.asamk.Signal.Group",
                     "Avatar",
         if (updateGroup.getAvatarFile() != null) {
             group.Set("org.asamk.Signal.Group",
                     "Avatar",

-                    updateGroup.getAvatarFile() == null ? "" : updateGroup.getAvatarFile().getPath());
+                    updateGroup.getAvatarFile() == null ? "" : updateGroup.getAvatarFile());

         }
         if (updateGroup.getExpirationTimer() != null) {
             group.Set("org.asamk.Signal.Group", "MessageExpirationTimer", updateGroup.getExpirationTimer());
         }
         if (updateGroup.getExpirationTimer() != null) {
             group.Set("org.asamk.Signal.Group", "MessageExpirationTimer", updateGroup.getExpirationTimer());


@@ -352,6 +366,13 @@ public class DbusManagerImpl implements Manager {
                 groupId -> signal.sendGroupMessage(message.messageText(), message.attachments(), groupId));
     }
 
                 groupId -> signal.sendGroupMessage(message.messageText(), message.attachments(), groupId));
     }
 

+    @Override
+    public SendMessageResults sendEditMessage(
+            final Message message, final Set<RecipientIdentifier> recipients, final long editTargetTimestamp
+    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
+        throw new UnsupportedOperationException();
+    }
+

     @Override
     public SendMessageResults sendRemoteDeleteMessage(
             final long targetSentTimestamp, final Set<RecipientIdentifier> recipients
     @Override
     public SendMessageResults sendRemoteDeleteMessage(
             final long targetSentTimestamp, final Set<RecipientIdentifier> recipients


@@ -368,7 +389,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,


@@ -392,7 +414,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


@@ -413,15 +436,15 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void setContactName(
 
     @Override
     public void setContactName(

-            final RecipientIdentifier.Single recipient, final String name
-    ) throws NotMasterDeviceException {
-        signal.setContactName(recipient.getIdentifier(), name);
+            final RecipientIdentifier.Single recipient, final String givenName, final String familyName
+    ) throws NotPrimaryDeviceException {
+        signal.setContactName(recipient.getIdentifier(), givenName);

     }
 
     @Override
     public void setContactsBlocked(
             final Collection<RecipientIdentifier.Single> recipients, final boolean blocked
     }
 
     @Override
     public void setContactsBlocked(
             final Collection<RecipientIdentifier.Single> recipients, final boolean blocked

-    ) throws NotMasterDeviceException, IOException {
+    ) throws NotPrimaryDeviceException, IOException {

         for (final var recipient : recipients) {
             signal.setContactBlocked(recipient.getIdentifier(), blocked);
         }
         for (final var recipient : recipients) {
             signal.setContactBlocked(recipient.getIdentifier(), blocked);
         }


@@ -499,49 +522,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
-    public void setIgnoreAttachments(final boolean ignoreAttachments) {
+        removeReceiveHandler(receiveHandler);

     }
 
     @Override
     }
 
     @Override

-    public boolean hasCaughtUpWithOldMessages() {
-        return true;
+    public void setReceiveConfig(final ReceiveConfig receiveConfig) {

     }
 
     @Override
     }
 
     @Override


@@ -579,7 +604,7 @@ public class DbusManagerImpl implements Manager {
             }
             return Recipient.newBuilder()
                     .withAddress(new RecipientAddress(null, n))
             }
             return Recipient.newBuilder()
                     .withAddress(new RecipientAddress(null, n))

-                    .withContact(new Contact(contactName, null, 0, contactBlocked, false, false))
+                    .withContact(new Contact(contactName, null, null, 0, contactBlocked, false, false))

                     .build();
         }).filter(Objects::nonNull).toList();
     }
                     .build();
         }).filter(Objects::nonNull).toList();
     }


@@ -755,12 +780,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(),


@@ -769,8 +796,11 @@ public class DbusManagerImpl implements Manager {
                                 Optional.empty(),
                                 List.of(),
                                 List.of(),
                                 Optional.empty(),
                                 List.of(),
                                 List.of(),

+                                List.of(),

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

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

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


@@ -796,6 +826,8 @@ public class DbusManagerImpl implements Manager {
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),

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

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


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

+                        Optional.empty(),

                         Optional.of(new MessageEnvelope.Sync(Optional.of(new MessageEnvelope.Sync.Sent(syncReceived.getTimestamp(),
                                 syncReceived.getTimestamp(),
                                 syncReceived.getDestination().isEmpty()
                         Optional.of(new MessageEnvelope.Sync(Optional.of(new MessageEnvelope.Sync.Sent(syncReceived.getTimestamp(),
                                 syncReceived.getTimestamp(),
                                 syncReceived.getDestination().isEmpty()


@@ -825,12 +858,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(),


@@ -839,7 +874,10 @@ public class DbusManagerImpl implements Manager {
                                         Optional.empty(),
                                         List.of(),
                                         List.of(),
                                         Optional.empty(),
                                         List.of(),
                                         List.of(),

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

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


@@ -847,6 +885,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);
             };


@@ -902,6 +941,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