X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/c8b9ab1911f1941c65795733fcd3ad6304d9682d..c3f05395267a72a6bb102f168fc1d6a3ec4d1dbf:/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..b2dbe60a 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) {
@@ -1436,13 +1436,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);