From 43f24f9c6c8d3dd867ddb3831ae37ca4fbf015fb Mon Sep 17 00:00:00 2001 From: adaptivegarage Date: Mon, 5 Apr 2021 18:36:41 +0200 Subject: [PATCH] Renaming dbus methods remoteGroupDelete -> sendGroupRemoteDeleteMessage, remoteDelete -> sendRemoteDeleteMessage --- .../main/java/org/asamk/signal/manager/Manager.java | 4 ++-- man/signal-cli-dbus.5.adoc | 6 +++--- src/main/java/org/asamk/Signal.java | 6 +++--- .../asamk/signal/commands/RemoteDeleteCommand.java | 4 ++-- .../java/org/asamk/signal/dbus/DbusSignalImpl.java | 12 ++++++------ 5 files changed, 16 insertions(+), 16 deletions(-) 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 cbdf2803..5d0e7d3d 100644 --- a/lib/src/main/java/org/asamk/signal/manager/Manager.java +++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java @@ -992,7 +992,7 @@ public class Manager implements Closeable { return sendSelfMessage(messageBuilder); } - public Pair> remoteDelete( + public Pair> sendRemoteDeleteMessage( long targetSentTimestamp, List recipients ) throws IOException, InvalidNumberException { var delete = new SignalServiceDataMessage.RemoteDelete(targetSentTimestamp); @@ -1000,7 +1000,7 @@ public class Manager implements Closeable { return sendMessage(messageBuilder, getSignalServiceAddresses(recipients)); } - public Pair> remoteGroupDelete( + public Pair> sendGroupRemoteDeleteMessage( long targetSentTimestamp, GroupId groupId ) throws IOException, NotAGroupMemberException, GroupNotFoundException { var delete = new SignalServiceDataMessage.RemoteDelete(targetSentTimestamp); diff --git a/man/signal-cli-dbus.5.adoc b/man/signal-cli-dbus.5.adoc index fc6cf6d1..ece2460f 100755 --- a/man/signal-cli-dbus.5.adoc +++ b/man/signal-cli-dbus.5.adoc @@ -149,15 +149,15 @@ Depending on the type of the recipient(s) field this sends a reaction to one or Exceptions: Failure, InvalidNumber -remoteGroupDelete(targetSentTimestamp, groupId) -> timestamp:: +sendGroupRemoteDeleteMessage(targetSentTimestamp, groupId) -> timestamp:: * targetSentTimestamp : Long representing timestamp of the message to delete * groupId : Byte array with base64 encoded group identifier * timestamp : Long, can be used to identify the corresponding signal reply Exceptions: Failure, GroupNotFound -remoteDelete(targetSentTimestamp, recipient) -> timestamp:: -remoteDelete(targetSentTimestamp, recipients) -> timestamp:: +sendRemoteDeleteMessage(targetSentTimestamp, recipient) -> timestamp:: +sendRemoteDeleteMessage(targetSentTimestamp, recipients) -> timestamp:: * targetSentTimestamp : Long representing timestamp of the message to delete * recipient : String with the phone number of a single recipient * recipients : Array of strings with phone numbers, should there be more recipients diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java index 7a433bbc..0093ab9b 100644 --- a/src/main/java/org/asamk/Signal.java +++ b/src/main/java/org/asamk/Signal.java @@ -21,15 +21,15 @@ public interface Signal extends DBusInterface { String message, List attachments, List recipients ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity; - long remoteDelete( + long sendRemoteDeleteMessage( long targetSentTimestamp, String recipient ) throws Error.Failure, Error.InvalidNumber; - long remoteDelete( + long sendRemoteDeleteMessage( long targetSentTimestamp, List recipients ) throws Error.Failure, Error.InvalidNumber; - long remoteGroupDelete( + long sendGroupRemoteDeleteMessage( long targetSentTimestamp, byte[] groupId ) throws Error.Failure, Error.GroupNotFound; diff --git a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java index c521b17e..796a3344 100644 --- a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java +++ b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java @@ -61,9 +61,9 @@ public class RemoteDeleteCommand implements DbusCommand { try { long timestamp; if (groupId != null) { - timestamp = signal.remoteGroupDelete(targetTimestamp, groupId); + timestamp = signal.sendGroupRemoteDeleteMessage(targetTimestamp, groupId); } else { - timestamp = signal.remoteDelete(targetTimestamp, recipients); + timestamp = signal.sendRemoteDeleteMessage(targetTimestamp, recipients); } writer.println("{}", timestamp); } catch (AssertionError e) { diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java index 3ce9ef81..6b22029b 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java @@ -104,20 +104,20 @@ public class DbusSignalImpl implements Signal { } @Override - public long remoteDelete( + public long sendRemoteDeleteMessage( final long targetSentTimestamp, final String recipient ) { var recipients = new ArrayList(1); recipients.add(recipient); - return remoteDelete(targetSentTimestamp, recipients); + return sendRemoteDeleteMessage(targetSentTimestamp, recipients); } @Override - public long remoteDelete( + public long sendRemoteDeleteMessage( final long targetSentTimestamp, final List recipients ) { try { - final var results = m.remoteDelete(targetSentTimestamp, recipients); + final var results = m.sendRemoteDeleteMessage(targetSentTimestamp, recipients); checkSendMessageResults(results.first(), results.second()); return results.first(); } catch (IOException e) { @@ -128,11 +128,11 @@ public class DbusSignalImpl implements Signal { } @Override - public long remoteGroupDelete( + public long sendGroupRemoteDeleteMessage( final long targetSentTimestamp, final byte[] groupId ) { try { - final var results = m.remoteGroupDelete(targetSentTimestamp, GroupId.unknownVersion(groupId)); + final var results = m.sendGroupRemoteDeleteMessage(targetSentTimestamp, GroupId.unknownVersion(groupId)); checkSendMessageResults(results.first(), results.second()); return results.first(); } catch (IOException e) {