X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/26620f3137bc7a3aa5a5e05510cfdac6c6fb3a32..9f7979314f2e3d5338b704f43e81da5a408d97b9:/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 201f0931..cdb6f640 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -231,6 +231,7 @@ class ManagerImpl implements Manager {
         if (deviceName != null) {
             context.getAccountHelper().setDeviceName(deviceName);
         }
+        context.getAccountHelper().checkWhoAmiI();
         context.getAccountHelper().updateAccountAttributes();
     }
 
@@ -830,9 +831,7 @@ class ManagerImpl implements Manager {
     }
 
     void retrieveRemoteStorage() throws IOException {
-        if (account.getStorageKey() != null) {
-            context.getStorageHelper().readDataFromStorage();
-        }
+        context.getStorageHelper().readDataFromStorage();
     }
 
     @Override
@@ -989,6 +988,9 @@ class ManagerImpl implements Manager {
                 return null;
             }
         }).filter(Objects::nonNull).collect(Collectors.toSet());
+        if (!recipients.isEmpty() && recipientIds.isEmpty()) {
+            return List.of();
+        }
         // refresh profiles of explicitly given recipients
         context.getProfileHelper().refreshRecipientProfiles(recipientIds);
         return account.getRecipientStore().getRecipients(onlyContacts, blocked, recipientIds, name);