From: AsamK Date: Sun, 5 Dec 2021 09:25:46 +0000 (+0100) Subject: Remove dead code and fix inspection issues X-Git-Tag: v0.10.0~31 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/e83f43065ecd7922de75ea4f9262d6f2770369b2?ds=inline 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 e84a5c16..ab9129e5 100644 --- 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; } 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 0498fba1..53e12d8e 100644 --- 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())); } - 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. @@ -95,7 +91,7 @@ public final class GroupInviteLinkUrl { 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())) 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 c1db77bf..69e348b0 100644 --- 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.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; @@ -57,7 +57,7 @@ public class GroupUtils { 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) { 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 b361f10d..343814b9 100644 --- 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(); } - public String getRegistrationLockPin() { - return registrationLockPin; - } - 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 31b2a85c..410b07f6 100644 --- 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 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 03bf8d79..e6c97d44 100644 --- 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); } - public static String createSignalingKey() { - return getSecret(52); - } - 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 adef6f96..e80f2d34 100644 --- 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(""), - avatar != null && !avatar.isPresent()); + avatar != null && avatar.isEmpty()); } @Override @@ -786,9 +786,8 @@ public class DbusManagerImpl implements Manager { 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 c7cb2ab7..da79f5bf 100644 --- 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 { - private final Manager m; 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; } @@ -127,7 +125,7 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler 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}")); } @@ -180,7 +178,7 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler } private Map> getAttachmentMap( - final Manager m, final MessageEnvelope.Data.Attachment a + final MessageEnvelope.Data.Attachment a ) { final var map = new HashMap>(); 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 6395eb14..0baacecb 100644 --- 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) { - dbusMessageHandler = new DbusReceiveMessageHandler(m, connection, objectPath); + dbusMessageHandler = new DbusReceiveMessageHandler(connection, objectPath); 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 ad46a567..1f6e6510 100644 --- 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); } - - 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 c645b512..d89c7d05 100644 --- 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 org.asamk.Signal; import org.asamk.signal.manager.api.MessageEnvelope; import java.util.List; @@ -65,38 +64,4 @@ record JsonDataMessage( 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 f00ace99..01e39900 100644 --- 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 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"); } - - 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 c3ecf340..6a453fed 100644 --- 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.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -16,8 +14,6 @@ import java.util.stream.Collectors; public class ErrorUtils { - private final static Logger logger = LoggerFactory.getLogger(ErrorUtils.class); - private ErrorUtils() { }