From 022cb969f67b46b38c6dc210bc0b761f3f66cdcb Mon Sep 17 00:00:00 2001 From: John Freed Date: Thu, 12 Aug 2021 09:52:28 +0200 Subject: [PATCH] temporarily remove isRegistered to allow cherry-pick --- src/main/java/org/asamk/Signal.java | 4 +-- .../org/asamk/signal/dbus/DbusSignalImpl.java | 27 ++----------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java index 8eff0510..601360ac 100644 --- a/src/main/java/org/asamk/Signal.java +++ b/src/main/java/org/asamk/Signal.java @@ -95,9 +95,7 @@ public interface Signal extends DBusInterface { byte[] groupId, String name, List members, String avatar ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.GroupNotFound; - boolean isRegistered(String number); - - List isRegistered(List numbers); + boolean isRegistered(); void updateProfile( String name, String about, String aboutEmoji, String avatarPath, boolean removeAvatar diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java index 180610e9..44d80468 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java @@ -512,31 +512,8 @@ public class DbusSignalImpl implements Signal { } @Override - public boolean isRegistered(String number) { - try { - Map registered; - List numbers = new ArrayList(); - numbers.add(number); - registered = m.areUsersRegistered(new HashSet(numbers)); - return registered.get(number); - } catch (IOException e) { - throw new Error.Failure(e.getMessage()); - } - } - - @Override - public List isRegistered(List numbers) { - try { - Map registered; - List results = new ArrayList (); - registered = m.areUsersRegistered(new HashSet(numbers)); - for (String number : numbers) { - results.add(registered.get(number)); - } - return results; - } catch (IOException e) { - throw new Error.Failure(e.getMessage()); - } + public boolean isRegistered() { + return true; } @Override