X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/c8b9ab1911f1941c65795733fcd3ad6304d9682d..d248f249e37f7b35a3b7dd69f2a06af8eddd3996:/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 87d3d0d0..df757a8b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -275,7 +275,7 @@ public class ManagerImpl implements Manager {
         try {
             preKeyHelper.refreshPreKeysIfNecessary();
             if (account.getAci() == null) {
-                account.setAci(dependencies.getAccountManager().getOwnAci());
+                account.setAci(ACI.parseOrNull(dependencies.getAccountManager().getWhoAmI().getAci()));
             }
             updateAccountAttributes(null);
         } catch (AuthorizationFailedException e) {
@@ -445,7 +445,7 @@ public class ManagerImpl implements Manager {
                     d.getCreated(),
                     d.getLastSeen(),
                     d.getId() == account.getDeviceId());
-        }).collect(Collectors.toList());
+        }).toList();
     }
 
     @Override
@@ -517,7 +517,7 @@ public class ManagerImpl implements Manager {
 
     @Override
     public List<Group> getGroups() {
-        return account.getGroupStore().getGroups().stream().map(this::toGroup).collect(Collectors.toList());
+        return account.getGroupStore().getGroups().stream().map(this::toGroup).toList();
     }
 
     private Group toGroup(final GroupInfo groupInfo) {
@@ -628,7 +628,7 @@ public class ManagerImpl implements Manager {
                                 .map(sendMessageResult -> SendMessageResult.from(sendMessageResult,
                                         account.getRecipientStore(),
                                         account.getRecipientStore()::resolveRecipientAddress))
-                                .collect(Collectors.toList()));
+                                .toList());
             }
         }
         return new SendMessageResults(timestamp, results);
@@ -657,7 +657,7 @@ public class ManagerImpl implements Manager {
                                 .map(r -> SendMessageResult.from(r,
                                         account.getRecipientStore(),
                                         account.getRecipientStore()::resolveRecipientAddress))
-                                .collect(Collectors.toList()));
+                                .toList());
             }
         }
         return new SendMessageResults(timestamp, results);
@@ -1283,7 +1283,7 @@ public class ManagerImpl implements Manager {
                 .getContacts()
                 .stream()
                 .map(p -> new Pair<>(account.getRecipientStore().resolveRecipientAddress(p.first()), p.second()))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -1319,11 +1319,7 @@ public class ManagerImpl implements Manager {
 
     @Override
     public List<Identity> getIdentities() {
-        return account.getIdentityKeyStore()
-                .getIdentities()
-                .stream()
-                .map(this::toIdentity)
-                .collect(Collectors.toList());
+        return account.getIdentityKeyStore().getIdentities().stream().map(this::toIdentity).toList();
     }
 
     private Identity toIdentity(final IdentityInfo identityInfo) {
@@ -1436,13 +1432,13 @@ public class ManagerImpl implements Manager {
 
     private SignalServiceAddress resolveSignalServiceAddress(RecipientId recipientId) {
         final var address = account.getRecipientStore().resolveRecipientAddress(recipientId);
-        if (address.getUuid().isPresent()) {
+        if (address.uuid().isPresent()) {
             return address.toSignalServiceAddress();
         }
 
         // Address in recipient store doesn't have a uuid, this shouldn't happen
         // Try to retrieve the uuid from the server
-        final var number = address.getNumber().get();
+        final var number = address.number().get();
         final ACI aci;
         try {
             aci = getRegisteredUser(number);