Remove libsignal-service from manager lib API

[signal-cli] / src / main / java / org / asamk / signal / dbus / DbusManagerImpl.java

diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index df0bb86925e2fe63914f5207fb89ea9a1b786ad9..4656975ec7bada54794cedad8ed7b1bba3a40079 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -33,10 +33,6 @@ import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.interfaces.DBusInterface;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.interfaces.DBusInterface;

-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
-import org.whispersystems.signalservice.api.util.UuidUtil;

 
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;


@@ -86,7 +82,7 @@ public class DbusManagerImpl implements Manager {
         final var result = new HashMap<String, Pair<String, UUID>>();
         for (var i = 0; i < numbersList.size(); i++) {
             result.put(numbersList.get(i),
         final var result = new HashMap<String, Pair<String, UUID>>();
         for (var i = 0; i < numbersList.size(); i++) {
             result.put(numbersList.get(i),

-                    new Pair<>(numbersList.get(i), registered.get(i) ? UuidUtil.UNKNOWN_UUID : null));
+                    new Pair<>(numbersList.get(i), registered.get(i) ? RecipientAddress.UNKNOWN_UUID : null));

         }
         return result;
     }
         }
         return result;
     }


@@ -175,7 +171,7 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public Profile getRecipientProfile(final RecipientIdentifier.Single recipient) throws UnregisteredUserException {
+    public Profile getRecipientProfile(final RecipientIdentifier.Single recipient) {

         throw new UnsupportedOperationException();
     }
 
         throw new UnsupportedOperationException();
     }
 


@@ -372,7 +368,7 @@ public class DbusManagerImpl implements Manager {
     @Override
     public void setContactName(
             final RecipientIdentifier.Single recipient, final String name
     @Override
     public void setContactName(
             final RecipientIdentifier.Single recipient, final String name

-    ) throws NotMasterDeviceException, UnregisteredUserException {
+    ) throws NotMasterDeviceException {

         signal.setContactName(recipient.getIdentifier(), name);
     }
 
         signal.setContactName(recipient.getIdentifier(), name);
     }
 


@@ -459,7 +455,7 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public File getAttachmentFile(final SignalServiceAttachmentRemoteId attachmentId) {
+    public File getAttachmentFile(final String attachmentId) {

         throw new UnsupportedOperationException();
     }
 
         throw new UnsupportedOperationException();
     }
 


@@ -551,11 +547,6 @@ public class DbusManagerImpl implements Manager {
         throw new UnsupportedOperationException();
     }
 
         throw new UnsupportedOperationException();
     }
 

-    @Override
-    public SignalServiceAddress resolveSignalServiceAddress(final SignalServiceAddress address) {
-        return address;
-    }
-

     @Override
     public void close() throws IOException {
     }
     @Override
     public void close() throws IOException {
     }


@@ -582,7 +573,7 @@ public class DbusManagerImpl implements Manager {
         final var groupRecipients = recipients.stream()
                 .filter(r -> r instanceof RecipientIdentifier.Group)
                 .map(RecipientIdentifier.Group.class::cast)
         final var groupRecipients = recipients.stream()
                 .filter(r -> r instanceof RecipientIdentifier.Group)
                 .map(RecipientIdentifier.Group.class::cast)

-                .map(g -> g.groupId)
+                .map(RecipientIdentifier.Group::groupId)

                 .collect(Collectors.toList());
         for (final var groupId : groupRecipients) {
             timestamp = groupHandler.apply(groupId.serialize());
                 .collect(Collectors.toList());
         for (final var groupId : groupRecipients) {
             timestamp = groupHandler.apply(groupId.serialize());