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 4f23d461610f49cbaab7a4d5b151333c1758cec7..8cbbbc03c113881a34ca2e3a27cf4e62762988c6 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -6,15 +6,12 @@ import org.asamk.signal.manager.Manager;
 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.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;

-import org.asamk.signal.manager.storage.groups.GroupInfo;

 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 org.whispersystems.libsignal.util.guava.Optional;
-import org.asamk.signal.manager.storage.contacts.ContactInfo;

 
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;


@@ -42,19 +39,19 @@ 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);
     }
 
     private static void checkSendMessageResult(long timestamp, SendMessageResult result) throws DBusExecutionException {
         recipients.add(recipient);
         return sendMessage(message, attachments, recipients);
     }
 
     private static void checkSendMessageResult(long timestamp, SendMessageResult result) throws DBusExecutionException {

-        String error = ErrorUtils.getErrorMessageFromSendMessageResult(result);
+        var error = ErrorUtils.getErrorMessageFromSendMessageResult(result);

 
         if (error == null) {
             return;
         }
 
 
         if (error == null) {
             return;
         }
 

-        final String message = timestamp + "\nFailed to send message:\n" + error + '\n';
+        final var message = timestamp + "\nFailed to send message:\n" + error + '\n';

 
         if (result.getIdentityFailure() != null) {
             throw new Error.UntrustedIdentity(message);
 
         if (result.getIdentityFailure() != null) {
             throw new Error.UntrustedIdentity(message);


@@ -71,15 +68,15 @@ public class DbusSignalImpl implements Signal {
             return;
         }
 
             return;
         }
 

-        List<String> errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
+        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');
         }
 


@@ -89,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) {


@@ -106,7 +103,7 @@ public class DbusSignalImpl implements Signal {
             final String message, final List<String> attachments
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {
             final String message, final List<String> attachments
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {

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

             checkSendMessageResult(results.first(), results.second());
             return results.first();
         } catch (AttachmentInvalidException e) {
             checkSendMessageResult(results.first(), results.second());
             return results.first();
         } catch (AttachmentInvalidException e) {


@@ -119,7 +116,7 @@ public class DbusSignalImpl implements Signal {
     @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());


@@ -131,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) {


@@ -183,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;


@@ -193,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 {


@@ -203,7 +198,7 @@ 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) {
             return List.of();
         } else {
         if (group == null) {
             return List.of();
         } else {


@@ -230,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 == null ? null : new File(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) {


@@ -252,9 +248,15 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

-    public void updateProfile(final String name,final String about,final String aboutEmoji, String avatarPath, final boolean removeAvatar) {
+    public void updateProfile(
+            final String name,
+            final String about,
+            final String aboutEmoji,
+            String avatarPath,
+            final boolean removeAvatar
+    ) {

         try {
         try {

-                if (avatarPath.isEmpty()) {
+            if (avatarPath.isEmpty()) {

                 avatarPath = null;
             }
             Optional<File> avatarFile = removeAvatar
                 avatarPath = null;
             }
             Optional<File> avatarFile = removeAvatar