Remove dead code and fix inspection issues

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index e84a5c1604b768082f43f8b2b29995fa5f2ec733..ab9129e5f4aa770854ec36a319353e99251c34a3 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -55,10 +55,6 @@ public class ServiceConfig {
         }
     }
 
         }
     }
 

-    public static AccountAttributes.Capabilities getCapabilities() {
-        return capabilities;
-    }
-

     public static KeyStore getIasKeyStore() {
         return iasKeyStore;
     }
     public static KeyStore getIasKeyStore() {
         return iasKeyStore;
     }

diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java
index 0498fba18454b7da18d1e892b8d80d0569df1bbf..53e12d8ed68fa2e97e6f4d5a32e9c2be65136316 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java
@@ -26,10 +26,6 @@ public final class GroupInviteLinkUrl {
                 GroupLinkPassword.fromBytes(group.getInviteLinkPassword().toByteArray()));
     }
 
                 GroupLinkPassword.fromBytes(group.getInviteLinkPassword().toByteArray()));
     }
 

-    public static boolean isGroupLink(String urlString) {
-        return getGroupUrl(urlString) != null;
-    }
-

     /**
      * @return null iff not a group url.
      * @throws InvalidGroupLinkException If group url, but cannot be parsed.
     /**
      * @return null iff not a group url.
      * @throws InvalidGroupLinkException If group url, but cannot be parsed.


@@ -95,7 +91,7 @@ public final class GroupInviteLinkUrl {
         this.url = createUrl(groupMasterKey, password);
     }
 
         this.url = createUrl(groupMasterKey, password);
     }
 

-    protected static String createUrl(GroupMasterKey groupMasterKey, GroupLinkPassword password) {
+    private static String createUrl(GroupMasterKey groupMasterKey, GroupLinkPassword password) {

         var groupInviteLink = GroupInviteLink.newBuilder()
                 .setV1Contents(GroupInviteLink.GroupInviteLinkContentsV1.newBuilder()
                         .setGroupMasterKey(ByteString.copyFrom(groupMasterKey.serialize()))
         var groupInviteLink = GroupInviteLink.newBuilder()
                 .setV1Contents(GroupInviteLink.GroupInviteLinkContentsV1.newBuilder()
                         .setGroupMasterKey(ByteString.copyFrom(groupMasterKey.serialize()))

diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
index c1db77bfd25ae4e1b6ad162e74efd20c89d23d11..69e348b037f89435642f4a443491804810dc6810 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
@@ -6,7 +6,7 @@ import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.groups.GroupMasterKey;
 import org.signal.zkgroup.groups.GroupSecretParams;
 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.groups.GroupMasterKey;
 import org.signal.zkgroup.groups.GroupSecretParams;

-import org.whispersystems.libsignal.kdf.HKDFv3;
+import org.whispersystems.libsignal.kdf.HKDF;

 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;


@@ -57,7 +57,7 @@ public class GroupUtils {
 
     private static GroupMasterKey deriveV2MigrationMasterKey(GroupIdV1 groupIdV1) {
         try {
 
     private static GroupMasterKey deriveV2MigrationMasterKey(GroupIdV1 groupIdV1) {
         try {

-            return new GroupMasterKey(new HKDFv3().deriveSecrets(groupIdV1.serialize(),
+            return new GroupMasterKey(HKDF.deriveSecrets(groupIdV1.serialize(),

                     "GV2 Migration".getBytes(),
                     GroupMasterKey.SIZE));
         } catch (InvalidInputException e) {
                     "GV2 Migration".getBytes(),
                     GroupMasterKey.SIZE));
         } catch (InvalidInputException e) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index b361f10d286931ef8734892d47009c2e2b750035..343814b9340da6efc2c04552c2f6ce5589aa0268 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -890,10 +890,6 @@ public class SignalAccount implements Closeable {
         save();
     }
 
         save();
     }
 

-    public String getRegistrationLockPin() {
-        return registrationLockPin;
-    }
-

     public void setRegistrationLockPin(final String registrationLockPin, final MasterKey pinMasterKey) {
         this.registrationLockPin = registrationLockPin;
         this.pinMasterKey = pinMasterKey;
     public void setRegistrationLockPin(final String registrationLockPin, final MasterKey pinMasterKey) {
         this.registrationLockPin = registrationLockPin;
         this.pinMasterKey = pinMasterKey;

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
index 31b2a85cf97728e65044b7b14dbc405f559d1001..410b07f6de0976683f95cd3776e2fba4d0b5f328 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
@@ -41,8 +41,4 @@ public class IdentityInfo {
     public Date getDateAdded() {
         return this.added;
     }
     public Date getDateAdded() {
         return this.added;
     }

-
-    public byte[] getFingerprint() {
-        return identityKey.getPublicKey().serialize();
-    }

 }
 }

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index 03bf8d79ad75af6ca2a969180841c89c9d4b44ce..e6c97d440f3f4ec826be0e1337f9166221e5eea8 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -68,10 +68,6 @@ public class KeyUtils {
         return new SignedPreKeyRecord(signedPreKeyId, System.currentTimeMillis(), keyPair, signature);
     }
 
         return new SignedPreKeyRecord(signedPreKeyId, System.currentTimeMillis(), keyPair, signature);
     }
 

-    public static String createSignalingKey() {
-        return getSecret(52);
-    }
-

     public static ProfileKey createProfileKey() {
         try {
             return new ProfileKey(getSecretBytes(32));
     public static ProfileKey createProfileKey() {
         try {
             return new ProfileKey(getSecretBytes(32));

diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index adef6f965c27854a91a050ae8afcdafc76d558b5..e80f2d34de20a2f87215c51b797580512d9856a1 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -131,7 +131,7 @@ public class DbusManagerImpl implements Manager {
                 emptyIfNull(about),
                 emptyIfNull(aboutEmoji),
                 avatar == null ? "" : avatar.map(File::getPath).orElse(""),
                 emptyIfNull(about),
                 emptyIfNull(aboutEmoji),
                 avatar == null ? "" : avatar.map(File::getPath).orElse(""),

-                avatar != null && !avatar.isPresent());
+                avatar != null && avatar.isEmpty());

     }
 
     @Override
     }
 
     @Override


@@ -786,9 +786,8 @@ public class DbusManagerImpl implements Manager {
 
     private void notifyMessageHandlers(final MessageEnvelope envelope) {
         synchronized (messageHandlers) {
 
     private void notifyMessageHandlers(final MessageEnvelope envelope) {
         synchronized (messageHandlers) {

-            Stream.concat(messageHandlers.stream(), weakHandlers.stream()).forEach(h -> {
-                h.handleMessage(envelope, null);
-            });
+            Stream.concat(messageHandlers.stream(), weakHandlers.stream())
+                    .forEach(h -> h.handleMessage(envelope, null));

         }
     }
 
         }
     }
 

diff --git a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
index c7cb2ab7f42a5d2c87ba130d4b5774f61402074b..da79f5bface03b9c0fa693ec9c2dc793fcfd3367 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
@@ -18,12 +18,10 @@ import java.util.stream.Collectors;
 
 public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 
 
 public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 

-    private final Manager m;

     private final DBusConnection conn;
     private final String objectPath;
 
     private final DBusConnection conn;
     private final String objectPath;
 

-    public DbusReceiveMessageHandler(Manager m, DBusConnection conn, final String objectPath) {
-        this.m = m;
+    public DbusReceiveMessageHandler(DBusConnection conn, final String objectPath) {

         this.conn = conn;
         this.objectPath = objectPath;
     }
         this.conn = conn;
         this.objectPath = objectPath;
     }


@@ -127,7 +125,7 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
             var attachments = message.attachments()
                     .stream()
                     .filter(a -> a.id().isPresent())
             var attachments = message.attachments()
                     .stream()
                     .filter(a -> a.id().isPresent())

-                    .map(a -> getAttachmentMap(m, a))
+                    .map(this::getAttachmentMap)

                     .collect(Collectors.toList());
             extras.put("attachments", new Variant<>(attachments, "aa{sv}"));
         }
                     .collect(Collectors.toList());
             extras.put("attachments", new Variant<>(attachments, "aa{sv}"));
         }


@@ -180,7 +178,7 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
     }
 
     private Map<String, Variant<?>> getAttachmentMap(
     }
 
     private Map<String, Variant<?>> getAttachmentMap(

-            final Manager m, final MessageEnvelope.Data.Attachment a
+            final MessageEnvelope.Data.Attachment a

     ) {
         final var map = new HashMap<String, Variant<?>>();
         if (a.id().isPresent()) {
     ) {
         final var map = new HashMap<String, Variant<?>>();
         if (a.id().isPresent()) {

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 6395eb1466f2e03d0e3dc7178003a829a988328d..0baacecba61729e52ecfce8049e588544be59499 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -111,7 +111,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public void subscribeReceive() {
         if (dbusMessageHandler == null) {
     @Override
     public void subscribeReceive() {
         if (dbusMessageHandler == null) {

-            dbusMessageHandler = new DbusReceiveMessageHandler(m, connection, objectPath);
+            dbusMessageHandler = new DbusReceiveMessageHandler(connection, objectPath);

             m.addReceiveHandler(dbusMessageHandler);
         }
         subscriberCount++;
             m.addReceiveHandler(dbusMessageHandler);
         }
         subscriberCount++;

diff --git a/src/main/java/org/asamk/signal/json/JsonAttachment.java b/src/main/java/org/asamk/signal/json/JsonAttachment.java
index ad46a567c73e41ceb027cae4ce769373f7d8ed1a..1f6e65101cd5fc2e18241e9d3c108bbd26a6e7e6 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonAttachment.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachment.java
@@ -10,8 +10,4 @@ record JsonAttachment(String contentType, String filename, String id, Long size)
         final var size = attachment.size().orElse(null);
         return new JsonAttachment(attachment.contentType(), filename, id, size);
     }
         final var size = attachment.size().orElse(null);
         return new JsonAttachment(attachment.contentType(), filename, id, size);
     }

-
-    static JsonAttachment from(String filename) {
-        return new JsonAttachment(filename, null, null, null);
-    }

 }
 }

diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index c645b512115cc10405aca7e252d54ab27661be03..d89c7d0584aba19d164a885960cf0b35dbfa83d3 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -2,7 +2,6 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

-import org.asamk.Signal;

 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;


@@ -65,38 +64,4 @@ record JsonDataMessage(
                 contacts,
                 groupInfo);
     }
                 contacts,
                 groupInfo);
     }

-
-    static JsonDataMessage from(Signal.MessageReceived messageReceived) {
-        return new JsonDataMessage(messageReceived.getTimestamp(),
-                messageReceived.getMessage(),
-                // TODO Replace these with the proper commands
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                messageReceived.getAttachments().stream().map(JsonAttachment::from).collect(Collectors.toList()),
-                null,
-                null,
-                null,
-                messageReceived.getGroupId().length > 0 ? JsonGroupInfo.from(messageReceived.getGroupId()) : null);
-    }
-
-    static JsonDataMessage from(Signal.SyncMessageReceived messageReceived) {
-        return new JsonDataMessage(messageReceived.getTimestamp(),
-                messageReceived.getMessage(),
-                // TODO Replace these with the proper commands
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                messageReceived.getAttachments().stream().map(JsonAttachment::from).collect(Collectors.toList()),
-                null,
-                null,
-                null,
-                messageReceived.getGroupId().length > 0 ? JsonGroupInfo.from(messageReceived.getGroupId()) : null);
-    }

 }
 }

diff --git a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
index f00ace993a76654ae12ea5e514b3ec10fd7e9a6c..01e39900516571ec827e3b7f1027960da63acd1e 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
+++ b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
@@ -2,16 +2,10 @@ package org.asamk.signal.json;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 

-import java.util.Base64;
-

 record JsonGroupInfo(String groupId, String type) {
 
     static JsonGroupInfo from(MessageEnvelope.Data.GroupContext groupContext) {
         return new JsonGroupInfo(groupContext.groupId().toBase64(),
                 groupContext.isGroupUpdate() ? "UPDATE" : "DELIVER");
     }
 record JsonGroupInfo(String groupId, String type) {
 
     static JsonGroupInfo from(MessageEnvelope.Data.GroupContext groupContext) {
         return new JsonGroupInfo(groupContext.groupId().toBase64(),
                 groupContext.isGroupUpdate() ? "UPDATE" : "DELIVER");
     }

-
-    static JsonGroupInfo from(byte[] groupId) {
-        return new JsonGroupInfo(Base64.getEncoder().encodeToString(groupId), "DELIVER");
-    }

 }
 }

diff --git a/src/main/java/org/asamk/signal/util/ErrorUtils.java b/src/main/java/org/asamk/signal/util/ErrorUtils.java
index c3ecf34097bc28903cea6bed6961354684e47127..6a453fed3a25b65bd2786f6a92e5e959b4352c5c 100644 (file)
--- a/src/main/java/org/asamk/signal/util/ErrorUtils.java
+++ b/src/main/java/org/asamk/signal/util/ErrorUtils.java
@@ -5,8 +5,6 @@ import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.manager.api.ProofRequiredException;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendMessageResult;
 import org.asamk.signal.manager.api.ProofRequiredException;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendMessageResult;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;

 
 import java.util.ArrayList;
 import java.util.Collection;
 
 import java.util.ArrayList;
 import java.util.Collection;


@@ -16,8 +14,6 @@ import java.util.stream.Collectors;
 
 public class ErrorUtils {
 
 
 public class ErrorUtils {
 

-    private final static Logger logger = LoggerFactory.getLogger(ErrorUtils.class);
-

     private ErrorUtils() {
     }
 
     private ErrorUtils() {
     }