Fix some inspection issues

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 876b68324f8dbcc9722d71b889f2be4ae04961e1..d28513b57360050ad351ac367dd23be8f8514ac2 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -37,31 +37,24 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
     public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
         if (dbusconnection != null) {
             try {
     public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
         if (dbusconnection != null) {
             try {

-                dbusconnection.addSigHandler(Signal.MessageReceived.class, new DBusSigHandler<Signal.MessageReceived>() {
-                    @Override
-                    public void handle(Signal.MessageReceived s) {
-                        System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",
-                                s.getSender(), DateUtils.formatTimestamp(s.getTimestamp()), s.getMessage()));
-                        if (s.getGroupId().length > 0) {
-                            System.out.println("Group info:");
-                            System.out.println("  Id: " + Base64.encodeBytes(s.getGroupId()));
-                        }
-                        if (s.getAttachments().size() > 0) {
-                            System.out.println("Attachments: ");
-                            for (String attachment : s.getAttachments()) {
-                                System.out.println("-  Stored plaintext in: " + attachment);
-                            }
-                        }
-                        System.out.println();
+                dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {
+                    System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",
+                            messageReceived.getSender(), DateUtils.formatTimestamp(messageReceived.getTimestamp()), messageReceived.getMessage()));
+                    if (messageReceived.getGroupId().length > 0) {
+                        System.out.println("Group info:");
+                        System.out.println("  Id: " + Base64.encodeBytes(messageReceived.getGroupId()));

                     }
                     }

-                });
-                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, new DBusSigHandler<Signal.ReceiptReceived>() {
-                    @Override
-                    public void handle(Signal.ReceiptReceived s) {
-                        System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
-                                s.getSender(), DateUtils.formatTimestamp(s.getTimestamp())));
+                    if (messageReceived.getAttachments().size() > 0) {
+                        System.out.println("Attachments: ");
+                        for (String attachment : messageReceived.getAttachments()) {
+                            System.out.println("-  Stored plaintext in: " + attachment);
+                        }

                     }
                     }

+                    System.out.println();

                 });
                 });

+                dbusconnection.addSigHandler(Signal.ReceiptReceived.class,
+                        receiptReceived -> System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
+                        receiptReceived.getSender(), DateUtils.formatTimestamp(receiptReceived.getTimestamp()))));

             } catch (UnsatisfiedLinkError e) {
                 System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
                 return 1;
             } catch (UnsatisfiedLinkError e) {
                 System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
                 return 1;

diff --git a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
index 39eb1f1b65ccbe675bb7280d7db79f61d49cf28b..b7de5402bbb86697ec0fce3ed61dad5fe1933b06 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
@@ -21,7 +21,7 @@ public class RemovePinCommand implements LocalCommand {
             return 1;
         }
         try {
             return 1;
         }
         try {

-            m.setRegistrationLockPin(Optional.<String>absent());
+            m.setRegistrationLockPin(Optional.absent());

             return 0;
         } catch (IOException e) {
             System.err.println("Remove pin error: " + e.getMessage());
             return 0;
         } catch (IOException e) {
             System.err.println("Remove pin error: " + e.getMessage());

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 7320d76d7e2074eb0843747a5ce1eaec3c8b7e51..a795cdd850ea661eacbe508d1dafb4d0e6fc8368 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -61,7 +61,7 @@ public class SendCommand implements DbusCommand {
 
         if (ns.getBoolean("endsession")) {
             try {
 
         if (ns.getBoolean("endsession")) {
             try {

-                signal.sendEndSessionMessage(ns.<String>getList("recipient"));
+                signal.sendEndSessionMessage(ns.getList("recipient"));

                 return 0;
             } catch (IOException e) {
                 handleIOException(e);
                 return 0;
             } catch (IOException e) {
                 handleIOException(e);


@@ -98,7 +98,7 @@ public class SendCommand implements DbusCommand {
                 byte[] groupId = Util.decodeGroupId(ns.getString("group"));
                 signal.sendGroupMessage(messageText, attachments, groupId);
             } else {
                 byte[] groupId = Util.decodeGroupId(ns.getString("group"));
                 signal.sendGroupMessage(messageText, attachments, groupId);
             } else {

-                signal.sendMessage(messageText, attachments, ns.<String>getList("recipient"));
+                signal.sendMessage(messageText, attachments, ns.getList("recipient"));

             }
             return 0;
         } catch (IOException e) {
             }
             return 0;
         } catch (IOException e) {

diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
index 38560642f2f82ae68cca0d279d0ac7ea00546182..7b72caae3b27e352305084c6410996b66237e952 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -69,7 +69,7 @@ public class SendReactionCommand implements LocalCommand {
                 byte[] groupId = Util.decodeGroupId(ns.getString("group"));
                 m.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId);
             } else {
                 byte[] groupId = Util.decodeGroupId(ns.getString("group"));
                 m.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId);
             } else {

-                m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, ns.<String>getList("recipient"));
+                m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, ns.getList("recipient"));

             }
             return 0;
         } catch (IOException e) {
             }
             return 0;
         } catch (IOException e) {

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 3a587257f5be93b68b07085a12f02477b09f3dd9..69e45102832f6e39146ef0849621fceba229f5be 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -260,9 +260,9 @@ public class Manager implements Signal {
         accountManager = getSignalServiceAccountManager();
 
         if (voiceVerification) {
         accountManager = getSignalServiceAccountManager();
 
         if (voiceVerification) {

-            accountManager.requestVoiceVerificationCode(Locale.getDefault(), Optional.<String>absent(), Optional.<String>absent());
+            accountManager.requestVoiceVerificationCode(Locale.getDefault(), Optional.absent(), Optional.absent());

         } else {
         } else {

-            accountManager.requestSmsVerificationCode(false, Optional.<String>absent(), Optional.<String>absent());
+            accountManager.requestSmsVerificationCode(false, Optional.absent(), Optional.absent());

         }
 
         account.setRegistered(false);
         }
 
         account.setRegistered(false);


@@ -291,7 +291,7 @@ public class Manager implements Signal {
         // When setting an empty GCM id, the Signal-Server also sets the fetchesMessages property to false.
         // If this is the master device, other users can't send messages to this number anymore.
         // If this is a linked device, other users can still send messages, but this device doesn't receive them anymore.
         // When setting an empty GCM id, the Signal-Server also sets the fetchesMessages property to false.
         // If this is the master device, other users can't send messages to this number anymore.
         // If this is a linked device, other users can still send messages, but this device doesn't receive them anymore.

-        accountManager.setGcmId(Optional.<String>absent());
+        accountManager.setGcmId(Optional.absent());

 
         account.setRegistered(false);
         account.save();
 
         account.setRegistered(false);
         account.save();


@@ -443,7 +443,7 @@ public class Manager implements Signal {
 
     private SignalServiceMessageSender getMessageSender() {
         return new SignalServiceMessageSender(BaseConfig.serviceConfiguration, null, username, account.getPassword(),
 
     private SignalServiceMessageSender getMessageSender() {
         return new SignalServiceMessageSender(BaseConfig.serviceConfiguration, null, username, account.getPassword(),

-                account.getDeviceId(), account.getSignalProtocolStore(), BaseConfig.USER_AGENT, account.isMultiDevice(), Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());
+                account.getDeviceId(), account.getSignalProtocolStore(), BaseConfig.USER_AGENT, account.isMultiDevice(), Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.absent());

     }
 
     private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException {
     }
 
     private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException {


@@ -891,7 +891,7 @@ public class Manager implements Signal {
     private List<Optional<UnidentifiedAccessPair>> getAccessFor(Collection<SignalServiceAddress> recipients) {
         List<Optional<UnidentifiedAccessPair>> result = new ArrayList<>(recipients.size());
         for (SignalServiceAddress recipient : recipients) {
     private List<Optional<UnidentifiedAccessPair>> getAccessFor(Collection<SignalServiceAddress> recipients) {
         List<Optional<UnidentifiedAccessPair>> result = new ArrayList<>(recipients.size());
         for (SignalServiceAddress recipient : recipients) {

-            result.add(Optional.<UnidentifiedAccessPair>absent());
+            result.add(Optional.absent());

         }
         return result;
     }
         }
         return result;
     }


@@ -1217,16 +1217,13 @@ public class Manager implements Signal {
                 Exception exception = null;
                 final long now = new Date().getTime();
                 try {
                 Exception exception = null;
                 final long now = new Date().getTime();
                 try {

-                    envelope = messagePipe.read(timeout, unit, new SignalServiceMessagePipe.MessagePipeCallback() {
-                        @Override
-                        public void onMessage(SignalServiceEnvelope envelope) {
-                            // store message on disk, before acknowledging receipt to the server
-                            try {
-                                File cacheFile = getMessageCacheFile(envelope.getSourceE164().get(), now, envelope.getTimestamp());
-                                Utils.storeEnvelope(envelope, cacheFile);
-                            } catch (IOException e) {
-                                System.err.println("Failed to store encrypted message in disk cache, ignoring: " + e.getMessage());
-                            }
+                    envelope = messagePipe.read(timeout, unit, envelope1 -> {
+                        // store message on disk, before acknowledging receipt to the server
+                        try {
+                            File cacheFile = getMessageCacheFile(envelope1.getSourceE164().get(), now, envelope1.getTimestamp());
+                            Utils.storeEnvelope(envelope1, cacheFile);
+                        } catch (IOException e) {
+                            System.err.println("Failed to store encrypted message in disk cache, ignoring: " + e.getMessage());

                         }
                     });
                 } catch (TimeoutException e) {
                         }
                     });
                 } catch (TimeoutException e) {


@@ -1633,10 +1630,10 @@ public class Manager implements Signal {
                 if (account.getProfileKey() != null) {
                     // Send our own profile key as well
                     out.write(new DeviceContact(account.getSelfAddress(),
                 if (account.getProfileKey() != null) {
                     // Send our own profile key as well
                     out.write(new DeviceContact(account.getSelfAddress(),

-                            Optional.<String>absent(), Optional.<SignalServiceAttachmentStream>absent(),
-                            Optional.<String>absent(), Optional.<VerifiedMessage>absent(),
+                            Optional.absent(), Optional.absent(),
+                            Optional.absent(), Optional.absent(),

                             Optional.of(account.getProfileKey()),
                             Optional.of(account.getProfileKey()),

-                            false, Optional.<Integer>absent(), Optional.<Integer>absent(), false));
+                            false, Optional.absent(), Optional.absent(), false));

                 }
             }
 
                 }
             }
 

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
index e6f0194d3e62472918e6108bc2468f788ea6ea43..c138134188e2832a54a196a9871177d1d703c918 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
@@ -185,7 +185,7 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
         }
     }
 
         }
     }
 

-    public class Identity {
+    public static class Identity {

 
         IdentityKey identityKey;
         TrustLevel trustLevel;
 
         IdentityKey identityKey;
         TrustLevel trustLevel;