From: AsamK Date: Sun, 21 May 2023 09:18:18 +0000 (+0200) Subject: Remove unused code X-Git-Tag: v0.11.11~9 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/8a0005d900d03ab631f45aa4abb594653b0c1720?ds=sidebyside Remove unused code --- diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java index b6602f57..6a5e43f5 100644 --- a/lib/src/main/java/org/asamk/signal/manager/Manager.java +++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java @@ -34,7 +34,6 @@ import org.asamk.signal.manager.groups.GroupNotFoundException; import org.asamk.signal.manager.groups.GroupSendingNotAllowedException; import org.asamk.signal.manager.groups.LastGroupAdminException; import org.asamk.signal.manager.groups.NotAGroupMemberException; -import org.asamk.signal.manager.storage.recipients.Profile; import org.whispersystems.signalservice.api.util.PhoneNumberFormatter; import java.io.Closeable; @@ -104,8 +103,6 @@ public interface Manager extends Closeable { void setRegistrationLockPin(Optional pin) throws IOException, NotPrimaryDeviceException; - Profile getRecipientProfile(RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException; - List getGroups(); SendGroupMessageResults quitGroup( @@ -221,14 +218,12 @@ public interface Manager extends Closeable { /** * Receive new messages from server, returns if no new message arrive in a timespan of timeout. */ - public void receiveMessages( + void receiveMessages( Optional timeout, Optional maxMessages, ReceiveMessageHandler handler ) throws IOException, AlreadyReceivingException; void setReceiveConfig(ReceiveConfig receiveConfig); - boolean hasCaughtUpWithOldMessages(); - boolean isContactBlocked(RecipientIdentifier.Single recipient); void sendContacts() throws IOException; diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java index 6895da63..1db3cbc7 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java @@ -377,11 +377,6 @@ class ManagerImpl implements Manager { context.getPreKeyHelper().refreshPreKeys(); } - @Override - public Profile getRecipientProfile(RecipientIdentifier.Single recipient) throws UnregisteredRecipientException { - return context.getProfileHelper().getRecipientProfile(context.getRecipientHelper().resolveRecipient(recipient)); - } - @Override public List getGroups() { return account.getGroupStore().getGroups().stream().map(this::toGroup).toList(); @@ -1053,11 +1048,6 @@ class ManagerImpl implements Manager { context.getReceiveHelper().setReceiveConfig(receiveConfig); } - @Override - public boolean hasCaughtUpWithOldMessages() { - return context.getReceiveHelper().hasCaughtUpWithOldMessages(); - } - @Override public boolean isContactBlocked(final RecipientIdentifier.Single recipient) { final RecipientId recipientId; diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java index c20fc692..d0ebbc95 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java @@ -61,10 +61,6 @@ public class ReceiveHelper { this.needsToRetryFailedMessages = needsToRetryFailedMessages; } - public boolean hasCaughtUpWithOldMessages() { - return hasCaughtUpWithOldMessages; - } - public void setAuthenticationFailureListener(final Callable authenticationFailureListener) { this.authenticationFailureListener = authenticationFailureListener; } diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java index 7eca1f20..e5f64ab3 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java @@ -38,7 +38,6 @@ import org.asamk.signal.manager.groups.GroupSendingNotAllowedException; import org.asamk.signal.manager.groups.LastGroupAdminException; import org.asamk.signal.manager.groups.NotAGroupMemberException; import org.asamk.signal.manager.storage.recipients.Contact; -import org.asamk.signal.manager.storage.recipients.Profile; import org.freedesktop.dbus.DBusMap; import org.freedesktop.dbus.DBusPath; import org.freedesktop.dbus.connections.impl.DBusConnection; @@ -213,11 +212,6 @@ public class DbusManagerImpl implements Manager { } } - @Override - public Profile getRecipientProfile(final RecipientIdentifier.Single recipient) { - throw new UnsupportedOperationException(); - } - @Override public List getGroups() { final var groups = signal.listGroups(); @@ -574,11 +568,6 @@ public class DbusManagerImpl implements Manager { public void setReceiveConfig(final ReceiveConfig receiveConfig) { } - @Override - public boolean hasCaughtUpWithOldMessages() { - return true; - } - @Override public boolean isContactBlocked(final RecipientIdentifier.Single recipient) { return signal.isContactBlocked(recipient.getIdentifier());