Refactor NoteToSelf to singleton class

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

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 82cd8f8d87c32e219053ba932cc37f2068007eb6..e975a67153a09b049e937d12dc686c84f95f90bc 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -276,7 +276,7 @@ public class DbusSignalImpl implements Signal {
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {
             final var results = m.sendMessage(new Message(message, attachments),
-                    Set.of(new RecipientIdentifier.NoteToSelf()));
+                    Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
             checkSendMessageResults(results.getTimestamp(), results.getResults());
             return results.getTimestamp();
         } catch (AttachmentInvalidException e) {
@@ -468,8 +468,7 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public boolean isRegistered() {
-        var result = isRegistered(List.of(m.getUsername()));
-        return result.get(0);
+        return true;
     }
 
     @Override
@@ -480,21 +479,44 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public List<Boolean> isRegistered(List<String> numbers) {
-        var results = new ArrayList<Boolean> ();
-        Map<String, Pair<String, UUID>> registered;
+        var results = new ArrayList<Boolean>();
         if (numbers.isEmpty()) {
             return results;
         }
+
+        Map<String, Pair<String, UUID>> registered;
         try {
-            registered = m.areUsersRegistered(new HashSet<String>(numbers));
+            registered = m.areUsersRegistered(new HashSet<>(numbers));
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         }
-        for (String number : numbers) {
-            UUID uuid = registered.get(number).second();
-            results.add(uuid != null);
+
+        return numbers.stream().map(number -> {
+            var uuid = registered.get(number).second();
+            return uuid != null;
+        }).collect(Collectors.toList());
+    }
+
+    @Override
+    public void updateProfile(
+            final String givenName,
+            final String familyName,
+            final String about,
+            final String aboutEmoji,
+            String avatarPath,
+            final boolean removeAvatar
+    ) {
+        try {
+            if (avatarPath.isEmpty()) {
+                avatarPath = null;
+            }
+            Optional<File> avatarFile = removeAvatar
+                    ? Optional.absent()
+                    : avatarPath == null ? null : Optional.of(new File(avatarPath));
+            m.setProfile(givenName, familyName, about, aboutEmoji, avatarFile);
+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());
         }
-        return results;
     }
 
     @Override