diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java index 0d25095d..1c7d9f1c 100644 --- a/src/main/java/org/asamk/Signal.java +++ b/src/main/java/org/asamk/Signal.java @@ -41,10 +41,6 @@ public interface Signal extends DBusInterface { List getGroupIds(); - List listGroups(); - - List listContacts(); - String getGroupName(byte[] groupId); List getGroupMembers(byte[] groupId); @@ -55,7 +51,7 @@ public interface Signal extends DBusInterface { boolean isRegistered(); - void updateProfile(String name,String about,String aboutEmoji,String avatarPath,boolean removeAvatar) throws Error.Failure; + void updateProfile(String name,String about,String aboutEmoji,String avatarPath,boolean removeAvatar) throws Error.Failure; class MessageReceived extends DBusSignal { diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java index d8f4aa26..4f23d461 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java @@ -250,42 +250,20 @@ public class DbusSignalImpl implements Signal { public boolean isRegistered() { return true; } - - @Override - public void updateProfile(final String name,final String about,final String aboutEmoji, String avatarPath, final boolean removeAvatar) { + + @Override + public void updateProfile(final String name,final String about,final String aboutEmoji, String avatarPath, final boolean removeAvatar) { try { - if (avatarPath.isEmpty()) { + if (avatarPath.isEmpty()) { avatarPath = null; } Optional avatarFile = removeAvatar ? Optional.absent() : avatarPath == null ? null : Optional.of(new File(avatarPath)); m.setProfile(name, about, aboutEmoji, avatarFile); - } catch (IOException e) { + } catch (IOException e) { throw new Error.Failure(e.getMessage()); - } - } - - @Override - public List listGroups() { - List groups = m.getGroups(); - List gr = new ArrayList<>(groups.size()); - for (GroupInfo group : groups) { - String entry="group="+group.getTitle()+" active:"+group.isMember(m.getSelfAddress())+" blocked:"+group.isBlocked(); - gr.add(entry); } - return gr; - } - - @Override - public List listContacts() { - List contacts = m.getContacts(); - List cc = new ArrayList<>(contacts.size()); - for (ContactInfo c : contacts) { - String entry="number:"+c.number+" name:"+c.name+" blocked:"+c.blocked; - cc.add(entry); - } - return cc; } }