X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/c1775913b9c54c84b45154aa841a0ba475c7c9fd..HEAD:/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 574f68c6..5658d0d3 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -49,7 +49,6 @@ import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.api.UsernameLinkUrl;
 import org.asamk.signal.manager.api.UsernameStatus;
-import org.freedesktop.dbus.DBusMap;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
@@ -202,14 +201,18 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void startChangeNumber(
-            final String newNumber, final boolean voiceVerification, final String captcha
+            final String newNumber,
+            final boolean voiceVerification,
+            final String captcha
     ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
         throw new UnsupportedOperationException();
     }
 
     @Override
     public void finishChangeNumber(
-            final String newNumber, final String verificationCode, final String pin
+            final String newNumber,
+            final String verificationCode,
+            final String pin
     ) throws IncorrectPinException, PinLockedException, IOException {
         throw new UnsupportedOperationException();
     }
@@ -271,7 +274,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendGroupMessageResults quitGroup(
-            final GroupId groupId, final Set<RecipientIdentifier.Single> groupAdmins
+            final GroupId groupId,
+            final Set<RecipientIdentifier.Single> groupAdmins
     ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException {
         if (!groupAdmins.isEmpty()) {
             throw new UnsupportedOperationException();
@@ -297,7 +301,9 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> createGroup(
-            final String name, final Set<RecipientIdentifier.Single> members, final String 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(),
@@ -307,7 +313,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendGroupMessageResults updateGroup(
-            final GroupId groupId, final UpdateGroup updateGroup
+            final GroupId groupId,
+            final UpdateGroup updateGroup
     ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException {
         final var group = getRemoteObject(signal.getGroup(groupId.serialize()), Signal.Group.class);
         if (updateGroup.getName() != null) {
@@ -381,7 +388,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendTypingMessage(
-            final TypingAction action, final Set<RecipientIdentifier> recipients
+            final TypingAction action,
+            final Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients, numbers -> {
             numbers.forEach(n -> signal.sendTyping(n, action == TypingAction.STOP));
@@ -396,24 +404,22 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
-    public SendMessageResults sendReadReceipt(
-            final RecipientIdentifier.Single sender, final List<Long> messageIds
-    ) {
+    public SendMessageResults sendReadReceipt(final RecipientIdentifier.Single sender, final List<Long> messageIds) {
         signal.sendReadReceipt(sender.getIdentifier(), messageIds);
         return new SendMessageResults(0, Map.of());
     }
 
     @Override
-    public SendMessageResults sendViewedReceipt(
-            final RecipientIdentifier.Single sender, final List<Long> messageIds
-    ) {
+    public SendMessageResults sendViewedReceipt(final RecipientIdentifier.Single sender, final List<Long> messageIds) {
         signal.sendViewedReceipt(sender.getIdentifier(), messageIds);
         return new SendMessageResults(0, Map.of());
     }
 
     @Override
     public SendMessageResults sendMessage(
-            final Message message, final Set<RecipientIdentifier> recipients, final boolean notifySelf
+            final Message message,
+            final Set<RecipientIdentifier> recipients,
+            final boolean notifySelf
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendMessage(message.messageText(), message.attachments(), numbers),
@@ -423,14 +429,17 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendEditMessage(
-            final Message message, final Set<RecipientIdentifier> recipients, final long editTargetTimestamp
+            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
+            final long targetSentTimestamp,
+            final Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendRemoteDeleteMessage(targetSentTimestamp, numbers),
@@ -467,7 +476,9 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendPaymentNotificationMessage(
-            final byte[] receipt, final String note, final RecipientIdentifier.Single recipient
+            final byte[] receipt,
+            final String note,
+            final RecipientIdentifier.Single recipient
     ) throws IOException {
         final var timestamp = signal.sendPaymentNotification(receipt, note, recipient.getIdentifier());
         return new SendMessageResults(timestamp, Map.of());
@@ -503,14 +514,20 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void setContactName(
-            final RecipientIdentifier.Single recipient, final String givenName, final String familyName
+            final RecipientIdentifier.Single recipient,
+            final String givenName,
+            final String familyName,
+            final String nickGivenName,
+            final String nickFamilyName,
+            final String note
     ) throws NotPrimaryDeviceException {
         signal.setContactName(recipient.getIdentifier(), givenName);
     }
 
     @Override
     public void setContactsBlocked(
-            final Collection<RecipientIdentifier.Single> recipients, final boolean blocked
+            final Collection<RecipientIdentifier.Single> recipients,
+            final boolean blocked
     ) throws NotPrimaryDeviceException, IOException {
         for (final var recipient : recipients) {
             signal.setContactBlocked(recipient.getIdentifier(), blocked);
@@ -519,7 +536,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void setGroupsBlocked(
-            final Collection<GroupId> groupIds, final boolean blocked
+            final Collection<GroupId> groupIds,
+            final boolean blocked
     ) throws GroupNotFoundException, IOException {
         for (final var groupId : groupIds) {
             setGroupProperty(groupId, "IsBlocked", blocked);
@@ -533,7 +551,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void setExpirationTimer(
-            final RecipientIdentifier.Single recipient, final int messageExpirationTimer
+            final RecipientIdentifier.Single recipient,
+            final int messageExpirationTimer
     ) throws IOException {
         signal.setExpirationTimer(recipient.getIdentifier(), messageExpirationTimer);
     }
@@ -598,7 +617,9 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void receiveMessages(
-            Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler
+            Optional<Duration> timeout,
+            Optional<Integer> maxMessages,
+            ReceiveMessageHandler handler
     ) throws IOException, AlreadyReceivingException {
         if (receiveThread != null) {
             throw new AlreadyReceivingException("Already receiving message.");
@@ -700,6 +721,7 @@ public class DbusManagerImpl implements Manager {
                             null,
                             null,
                             0,
+                            1,
                             0,
                             false,
                             contactBlocked,
@@ -784,7 +806,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public boolean trustIdentityVerified(
-            final RecipientIdentifier.Single recipient, final IdentityVerificationCode verificationCode
+            final RecipientIdentifier.Single recipient,
+            final IdentityVerificationCode verificationCode
     ) {
         throw new UnsupportedOperationException();
     }
@@ -1063,7 +1086,7 @@ public class DbusManagerImpl implements Manager {
             return List.of();
         }
 
-        final List<DBusMap<String, Variant<?>>> attachments = getValue(extras, "attachments");
+        final List<Map<String, Variant<?>>> attachments = getValue(extras, "attachments");
         return attachments.stream().map(a -> {
             final String file = a.containsKey("file") ? getValue(a, "file") : null;
             return new MessageEnvelope.Data.Attachment(a.containsKey("remoteId")
@@ -1090,7 +1113,7 @@ public class DbusManagerImpl implements Manager {
             return List.of();
         }
 
-        final List<DBusMap<String, Variant<?>>> mentions = getValue(extras, "mentions");
+        final List<Map<String, Variant<?>>> mentions = getValue(extras, "mentions");
         return mentions.stream()
                 .map(a -> new MessageEnvelope.Data.Mention(new RecipientAddress(this.<String>getValue(a, "recipient")),
                         getValue(a, "start"),
@@ -1124,9 +1147,7 @@ public class DbusManagerImpl implements Manager {
     }
 
     @SuppressWarnings("unchecked")
-    private <T> T getValue(
-            final Map<String, Variant<?>> stringVariantMap, final String field
-    ) {
+    private <T> T getValue(final Map<String, Variant<?>> stringVariantMap, final String field) {
         return (T) stringVariantMap.get(field).getValue();
     }
 }