Use var instead of explicit types

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

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index cbb7283504b6ace1efb6875f7a621a11625cf5d5..8cbbbc03c113881a34ca2e3a27cf4e62762988c6 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -2,21 +2,20 @@ package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.AttachmentInvalidException;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.AttachmentInvalidException;

-import org.asamk.signal.manager.GroupId;
-import org.asamk.signal.manager.GroupNotFoundException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.NotAGroupMemberException;
-import org.asamk.signal.storage.groups.GroupInfo;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.manager.groups.NotAGroupMemberException;

 import org.asamk.signal.util.ErrorUtils;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.asamk.signal.util.ErrorUtils;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;

-import org.whispersystems.libsignal.util.Pair;
+import org.whispersystems.libsignal.util.guava.Optional;

 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 

+import java.io.File;

 import java.io.IOException;
 import java.util.ArrayList;
 import java.io.IOException;
 import java.util.ArrayList;

-import java.util.Collections;

 import java.util.List;
 import java.util.stream.Collectors;
 
 import java.util.List;
 import java.util.stream.Collectors;
 


@@ -40,23 +39,44 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public long sendMessage(final String message, final List<String> attachments, final String recipient) {
 
     @Override
     public long sendMessage(final String message, final List<String> attachments, final String recipient) {

-        List<String> recipients = new ArrayList<>(1);
+        var recipients = new ArrayList<String>(1);

         recipients.add(recipient);
         return sendMessage(message, attachments, recipients);
     }
 
         recipients.add(recipient);
         return sendMessage(message, attachments, recipients);
     }
 

+    private static void checkSendMessageResult(long timestamp, SendMessageResult result) throws DBusExecutionException {
+        var error = ErrorUtils.getErrorMessageFromSendMessageResult(result);
+
+        if (error == null) {
+            return;
+        }
+
+        final var message = timestamp + "\nFailed to send message:\n" + error + '\n';
+
+        if (result.getIdentityFailure() != null) {
+            throw new Error.UntrustedIdentity(message);
+        } else {
+            throw new Error.Failure(message);
+        }
+    }
+

     private static void checkSendMessageResults(
             long timestamp, List<SendMessageResult> results
     ) throws DBusExecutionException {
     private static void checkSendMessageResults(
             long timestamp, List<SendMessageResult> results
     ) throws DBusExecutionException {

-        List<String> errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
+        if (results.size() == 1) {
+            checkSendMessageResult(timestamp, results.get(0));
+            return;
+        }
+
+        var errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);

         if (errors.size() == 0) {
             return;
         }
 
         if (errors.size() == 0) {
             return;
         }
 

-        StringBuilder message = new StringBuilder();
+        var message = new StringBuilder();

         message.append(timestamp).append('\n');
         message.append("Failed to send (some) messages:\n");
         message.append(timestamp).append('\n');
         message.append("Failed to send (some) messages:\n");

-        for (String error : errors) {
+        for (var error : errors) {

             message.append(error).append('\n');
         }
 
             message.append(error).append('\n');
         }
 


@@ -66,7 +86,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
         try {
     @Override
     public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
         try {

-            final Pair<Long, List<SendMessageResult>> results = m.sendMessage(message, attachments, recipients);
+            final var results = m.sendMessage(message, attachments, recipients);

             checkSendMessageResults(results.first(), results.second());
             return results.first();
         } catch (InvalidNumberException e) {
             checkSendMessageResults(results.first(), results.second());
             return results.first();
         } catch (InvalidNumberException e) {


@@ -78,10 +98,25 @@ public class DbusSignalImpl implements Signal {
         }
     }
 
         }
     }
 

+    @Override
+    public long sendNoteToSelfMessage(
+            final String message, final List<String> attachments
+    ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
+        try {
+            final var results = m.sendSelfMessage(message, attachments);
+            checkSendMessageResult(results.first(), results.second());
+            return results.first();
+        } catch (AttachmentInvalidException e) {
+            throw new Error.AttachmentInvalid(e.getMessage());
+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());
+        }
+    }
+

     @Override
     public void sendEndSessionMessage(final List<String> recipients) {
         try {
     @Override
     public void sendEndSessionMessage(final List<String> recipients) {
         try {

-            final Pair<Long, List<SendMessageResult>> results = m.sendEndSessionMessage(recipients);
+            final var results = m.sendEndSessionMessage(recipients);

             checkSendMessageResults(results.first(), results.second());
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
             checkSendMessageResults(results.first(), results.second());
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());


@@ -93,9 +128,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
         try {
     @Override
     public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
         try {

-            Pair<Long, List<SendMessageResult>> results = m.sendGroupMessage(message,
-                    attachments,
-                    GroupId.unknownVersion(groupId));
+            var results = m.sendGroupMessage(message, attachments, GroupId.unknownVersion(groupId));

             checkSendMessageResults(results.first(), results.second());
             return results.first();
         } catch (IOException e) {
             checkSendMessageResults(results.first(), results.second());
             return results.first();
         } catch (IOException e) {


@@ -145,9 +178,9 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public List<byte[]> getGroupIds() {
 
     @Override
     public List<byte[]> getGroupIds() {

-        List<GroupInfo> groups = m.getGroups();
-        List<byte[]> ids = new ArrayList<>(groups.size());
-        for (GroupInfo group : groups) {
+        var groups = m.getGroups();
+        var ids = new ArrayList<byte[]>(groups.size());
+        for (var group : groups) {

             ids.add(group.getGroupId().serialize());
         }
         return ids;
             ids.add(group.getGroupId().serialize());
         }
         return ids;


@@ -155,7 +188,7 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public String getGroupName(final byte[] groupId) {
 
     @Override
     public String getGroupName(final byte[] groupId) {

-        GroupInfo group = m.getGroup(GroupId.unknownVersion(groupId));
+        var group = m.getGroup(GroupId.unknownVersion(groupId));

         if (group == null) {
             return "";
         } else {
         if (group == null) {
             return "";
         } else {


@@ -165,9 +198,9 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public List<String> getGroupMembers(final byte[] groupId) {
 
     @Override
     public List<String> getGroupMembers(final byte[] groupId) {

-        GroupInfo group = m.getGroup(GroupId.unknownVersion(groupId));
+        var group = m.getGroup(GroupId.unknownVersion(groupId));

         if (group == null) {
         if (group == null) {

-            return Collections.emptyList();
+            return List.of();

         } else {
             return group.getMembers()
                     .stream()
         } else {
             return group.getMembers()
                     .stream()


@@ -192,9 +225,10 @@ public class DbusSignalImpl implements Signal {
             if (avatar.isEmpty()) {
                 avatar = null;
             }
             if (avatar.isEmpty()) {
                 avatar = null;
             }

-            final Pair<GroupId, List<SendMessageResult>> results = m.updateGroup(groupId == null
-                    ? null
-                    : GroupId.unknownVersion(groupId), name, members, avatar);
+            final var results = m.updateGroup(groupId == null ? null : GroupId.unknownVersion(groupId),
+                    name,
+                    members,
+                    avatar == null ? null : new File(avatar));

             checkSendMessageResults(0, results.second());
             return results.first().serialize();
         } catch (IOException e) {
             checkSendMessageResults(0, results.second());
             return results.first().serialize();
         } catch (IOException e) {


@@ -212,4 +246,26 @@ public class DbusSignalImpl implements Signal {
     public boolean isRegistered() {
         return true;
     }
     public boolean isRegistered() {
         return true;
     }

+
+    @Override
+    public void updateProfile(
+            final String name,
+            final String about,
+            final String aboutEmoji,
+            String avatarPath,
+            final boolean removeAvatar
+    ) {
+        try {
+            if (avatarPath.isEmpty()) {
+                avatarPath = null;
+            }
+            Optional<File> avatarFile = removeAvatar
+                    ? Optional.absent()
+                    : avatarPath == null ? null : Optional.of(new File(avatarPath));
+            m.setProfile(name, about, aboutEmoji, avatarFile);
+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());
+        }
+    }
+

 }
 }