Refactor register and verify

[signal-cli] / src / main / java / org / asamk / signal / manager / Manager.java

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 25b2ec54080e5e3d753c4b9c565715860ed04e10..9d090a5873bbdc0576001a9be0865034fee5b82c 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -26,6 +26,7 @@ import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.helper.GroupHelper;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.helper.GroupHelper;

+import org.asamk.signal.manager.helper.PinHelper;

 import org.asamk.signal.manager.helper.ProfileHelper;
 import org.asamk.signal.manager.helper.UnidentifiedAccessHelper;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.helper.ProfileHelper;
 import org.asamk.signal.manager.helper.UnidentifiedAccessHelper;
 import org.asamk.signal.manager.storage.SignalAccount;


@@ -78,10 +79,10 @@ import org.whispersystems.libsignal.ecc.ECKeyPair;
 import org.whispersystems.libsignal.ecc.ECPublicKey;
 import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.ecc.ECPublicKey;
 import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;

-import org.whispersystems.libsignal.util.KeyHelper;

 import org.whispersystems.libsignal.util.Medium;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.libsignal.util.Medium;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;

+import org.whispersystems.signalservice.api.KeyBackupService;

 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;


@@ -96,6 +97,7 @@ import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2AuthorizationString;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2AuthorizationString;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;

+import org.whispersystems.signalservice.api.kbs.MasterKey;

 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;


@@ -140,7 +142,6 @@ import org.whispersystems.signalservice.internal.contacts.crypto.Unauthenticated
 import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;
 import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;

-import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;

 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 import org.whispersystems.signalservice.internal.util.Hex;
 import org.whispersystems.util.Base64;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 import org.whispersystems.signalservice.internal.util.Hex;
 import org.whispersystems.util.Base64;


@@ -168,7 +169,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;

-import java.util.Locale;

 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;


@@ -193,22 +193,22 @@ public class Manager implements Closeable {
 
     private final SignalServiceConfiguration serviceConfiguration;
     private final String userAgent;
 
     private final SignalServiceConfiguration serviceConfiguration;
     private final String userAgent;

-    private final boolean discoverableByPhoneNumber = true;
-    private final boolean unrestrictedUnidentifiedAccess = false;

 
 

-    private final SignalAccount account;
+    private SignalAccount account;

     private final PathConfig pathConfig;
     private final PathConfig pathConfig;

-    private SignalServiceAccountManager accountManager;
-    private GroupsV2Api groupsV2Api;
+    private final SignalServiceAccountManager accountManager;
+    private final GroupsV2Api groupsV2Api;

     private final GroupsV2Operations groupsV2Operations;
     private final GroupsV2Operations groupsV2Operations;

+    private final SignalServiceMessageReceiver messageReceiver;
+    private final ClientZkProfileOperations clientZkProfileOperations;

 
 

-    private SignalServiceMessageReceiver messageReceiver = null;

     private SignalServiceMessagePipe messagePipe = null;
     private SignalServiceMessagePipe unidentifiedMessagePipe = null;
 
     private final UnidentifiedAccessHelper unidentifiedAccessHelper;
     private final ProfileHelper profileHelper;
     private final GroupHelper groupHelper;
     private SignalServiceMessagePipe messagePipe = null;
     private SignalServiceMessagePipe unidentifiedMessagePipe = null;
 
     private final UnidentifiedAccessHelper unidentifiedAccessHelper;
     private final ProfileHelper profileHelper;
     private final GroupHelper groupHelper;

+    private final PinHelper pinHelper;

 
     Manager(
             SignalAccount account,
 
     Manager(
             SignalAccount account,


@@ -222,8 +222,30 @@ public class Manager implements Closeable {
         this.userAgent = userAgent;
         this.groupsV2Operations = capabilities.isGv2() ? new GroupsV2Operations(ClientZkOperations.create(
                 serviceConfiguration)) : null;
         this.userAgent = userAgent;
         this.groupsV2Operations = capabilities.isGv2() ? new GroupsV2Operations(ClientZkOperations.create(
                 serviceConfiguration)) : null;

-        this.accountManager = createSignalServiceAccountManager();
+        this.accountManager = new SignalServiceAccountManager(serviceConfiguration,
+                new DynamicCredentialsProvider(account.getUuid(),
+                        account.getUsername(),
+                        account.getPassword(),
+                        account.getSignalingKey(),
+                        account.getDeviceId()),
+                userAgent,
+                groupsV2Operations,
+                timer);

         this.groupsV2Api = accountManager.getGroupsV2Api();
         this.groupsV2Api = accountManager.getGroupsV2Api();

+        final KeyBackupService keyBackupService = ServiceConfig.createKeyBackupService(accountManager);
+        this.pinHelper = new PinHelper(keyBackupService);
+        this.clientZkProfileOperations = capabilities.isGv2() ? ClientZkOperations.create(serviceConfiguration)
+                .getProfileOperations() : null;
+        this.messageReceiver = new SignalServiceMessageReceiver(serviceConfiguration,
+                account.getUuid(),
+                account.getUsername(),
+                account.getPassword(),
+                account.getDeviceId(),
+                account.getSignalingKey(),
+                userAgent,
+                null,
+                timer,
+                clientZkProfileOperations);

 
         this.account.setResolver(this::resolveSignalServiceAddress);
 
 
         this.account.setResolver(this::resolveSignalServiceAddress);
 


@@ -234,7 +256,7 @@ public class Manager implements Closeable {
         this.profileHelper = new ProfileHelper(account.getProfileStore()::getProfileKey,
                 unidentifiedAccessHelper::getAccessFor,
                 unidentified -> unidentified ? getOrCreateUnidentifiedMessagePipe() : getOrCreateMessagePipe(),
         this.profileHelper = new ProfileHelper(account.getProfileStore()::getProfileKey,
                 unidentifiedAccessHelper::getAccessFor,
                 unidentified -> unidentified ? getOrCreateUnidentifiedMessagePipe() : getOrCreateMessagePipe(),

-                this::getOrCreateMessageReceiver);
+                () -> messageReceiver);

         this.groupHelper = new GroupHelper(this::getRecipientProfileKeyCredential,
                 this::getRecipientProfile,
                 account::getSelfAddress,
         this.groupHelper = new GroupHelper(this::getRecipientProfileKeyCredential,
                 this::getRecipientProfile,
                 account::getSelfAddress,


@@ -251,18 +273,6 @@ public class Manager implements Closeable {
         return account.getSelfAddress();
     }
 
         return account.getSelfAddress();
     }
 

-    private SignalServiceAccountManager createSignalServiceAccountManager() {
-        return new SignalServiceAccountManager(serviceConfiguration,
-                new DynamicCredentialsProvider(account.getUuid(),
-                        account.getUsername(),
-                        account.getPassword(),
-                        null,
-                        account.getDeviceId()),
-                userAgent,
-                groupsV2Operations,
-                timer);
-    }
-

     private IdentityKeyPair getIdentityKeyPair() {
         return account.getSignalProtocolStore().getIdentityKeyPair();
     }
     private IdentityKeyPair getIdentityKeyPair() {
         return account.getSignalProtocolStore().getIdentityKeyPair();
     }


@@ -291,56 +301,20 @@ public class Manager implements Closeable {
 
     public static Manager init(
             String username, File settingsPath, SignalServiceConfiguration serviceConfiguration, String userAgent
 
     public static Manager init(
             String username, File settingsPath, SignalServiceConfiguration serviceConfiguration, String userAgent

-    ) throws IOException {
+    ) throws IOException, NotRegisteredException {

         PathConfig pathConfig = PathConfig.createDefault(settingsPath);
 
         if (!SignalAccount.userExists(pathConfig.getDataPath(), username)) {
         PathConfig pathConfig = PathConfig.createDefault(settingsPath);
 
         if (!SignalAccount.userExists(pathConfig.getDataPath(), username)) {

-            IdentityKeyPair identityKey = KeyHelper.generateIdentityKeyPair();
-            int registrationId = KeyHelper.generateRegistrationId(false);
-
-            ProfileKey profileKey = KeyUtils.createProfileKey();
-            SignalAccount account = SignalAccount.create(pathConfig.getDataPath(),
-                    username,
-                    identityKey,
-                    registrationId,
-                    profileKey);
-            account.save();
-
-            return new Manager(account, pathConfig, serviceConfiguration, userAgent);
+            throw new NotRegisteredException();

         }
 
         SignalAccount account = SignalAccount.load(pathConfig.getDataPath(), username);
 
         }
 
         SignalAccount account = SignalAccount.load(pathConfig.getDataPath(), username);
 

-        Manager m = new Manager(account, pathConfig, serviceConfiguration, userAgent);
-
-        m.migrateLegacyConfigs();
-
-        return m;
-    }
-
-    private void migrateLegacyConfigs() {
-        if (account.getProfileKey() == null && isRegistered()) {
-            // Old config file, creating new profile key
-            account.setProfileKey(KeyUtils.createProfileKey());
-            account.save();
-        }
-        // Store profile keys only in profile store
-        for (ContactInfo contact : account.getContactStore().getContacts()) {
-            String profileKeyString = contact.profileKey;
-            if (profileKeyString == null) {
-                continue;
-            }
-            final ProfileKey profileKey;
-            try {
-                profileKey = new ProfileKey(Base64.decode(profileKeyString));
-            } catch (InvalidInputException | IOException e) {
-                continue;
-            }
-            contact.profileKey = null;
-            account.getProfileStore().storeProfileKey(contact.getAddress(), profileKey);
+        if (!account.isRegistered()) {
+            throw new NotRegisteredException();

         }
         }

-        // Ensure our profile key is stored in profile store
-        account.getProfileStore().storeProfileKey(getSelfAddress(), account.getProfileKey());
+
+        return new Manager(account, pathConfig, serviceConfiguration, userAgent);

     }
 
     public void checkAccountState() throws IOException {
     }
 
     public void checkAccountState() throws IOException {


@@ -361,36 +335,35 @@ public class Manager implements Closeable {
         return account.isRegistered();
     }
 
         return account.isRegistered();
     }
 

-    public void register(boolean voiceVerification, String captcha) throws IOException {
-        account.setPassword(KeyUtils.createPassword());
-
-        // Resetting UUID, because registering doesn't work otherwise
-        account.setUuid(null);
-        accountManager = createSignalServiceAccountManager();
-        this.groupsV2Api = accountManager.getGroupsV2Api();
+    /**
+     * This is used for checking a set of phone numbers for registration on Signal
+     *
+     * @param numbers The set of phone number in question
+     * @return A map of numbers to booleans. True if registered, false otherwise. Should never be null
+     * @throws IOException if its unable to check if the users are registered
+     */
+    public Map<String, Boolean> areUsersRegistered(Set<String> numbers) throws IOException {
+        // Note "contactDetails" has no optionals. It only gives us info on users who are registered
+        List<ContactTokenDetails> contactDetails = this.accountManager.getContacts(numbers);

 
 

-        if (voiceVerification) {
-            accountManager.requestVoiceVerificationCode(Locale.getDefault(),
-                    Optional.fromNullable(captcha),
-                    Optional.absent());
-        } else {
-            accountManager.requestSmsVerificationCode(false, Optional.fromNullable(captcha), Optional.absent());
-        }
+        Set<String> registeredUsers = contactDetails.stream()
+                .map(ContactTokenDetails::getNumber)
+                .collect(Collectors.toSet());

 
 

-        account.setRegistered(false);
-        account.save();
+        return numbers.stream().collect(Collectors.toMap(x -> x, registeredUsers::contains));

     }
 
     public void updateAccountAttributes() throws IOException {
         accountManager.setAccountAttributes(account.getSignalingKey(),
                 account.getSignalProtocolStore().getLocalRegistrationId(),
                 true,
     }
 
     public void updateAccountAttributes() throws IOException {
         accountManager.setAccountAttributes(account.getSignalingKey(),
                 account.getSignalProtocolStore().getLocalRegistrationId(),
                 true,

-                account.getRegistrationLockPin(),
-                account.getRegistrationLock(),
-                unidentifiedAccessHelper.getSelfUnidentifiedAccessKey(),
-                unrestrictedUnidentifiedAccess,
+                // set legacy pin only if no KBS master key is set
+                account.getPinMasterKey() == null ? account.getRegistrationLockPin() : null,
+                account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(),
+                account.getSelfUnidentifiedAccessKey(),
+                account.isUnrestrictedUnidentifiedAccess(),

                 capabilities,
                 capabilities,

-                discoverableByPhoneNumber);
+                account.isDiscoverableByPhoneNumber());

     }
 
     public void setProfile(String name, File avatar) throws IOException {
     }
 
     public void setProfile(String name, File avatar) throws IOException {


@@ -479,43 +452,25 @@ public class Manager implements Closeable {
         }
     }
 
         }
     }
 

-    public void verifyAccount(String verificationCode, String pin) throws IOException {
-        verificationCode = verificationCode.replace("-", "");
-        account.setSignalingKey(KeyUtils.createSignalingKey());
-        // TODO make unrestricted unidentified access configurable
-        VerifyAccountResponse response = accountManager.verifyAccountWithCode(verificationCode,
-                account.getSignalingKey(),
-                account.getSignalProtocolStore().getLocalRegistrationId(),
-                true,
-                pin,
-                null,
-                unidentifiedAccessHelper.getSelfUnidentifiedAccessKey(),
-                unrestrictedUnidentifiedAccess,
-                capabilities,
-                discoverableByPhoneNumber);
-
-        UUID uuid = UuidUtil.parseOrNull(response.getUuid());
-        // TODO response.isStorageCapable()
-        //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
-        account.setRegistered(true);
-        account.setUuid(uuid);
-        account.setRegistrationLockPin(pin);
-        account.getSignalProtocolStore()
-                .saveIdentity(account.getSelfAddress(),
-                        getIdentityKeyPair().getPublicKey(),
-                        TrustLevel.TRUSTED_VERIFIED);
-
-        refreshPreKeys();
-        account.save();
-    }
-
-    public void setRegistrationLockPin(Optional<String> pin) throws IOException {
+    public void setRegistrationLockPin(Optional<String> pin) throws IOException, UnauthenticatedResponseException {

         if (pin.isPresent()) {
         if (pin.isPresent()) {

+            final MasterKey masterKey = account.getPinMasterKey() != null
+                    ? account.getPinMasterKey()
+                    : KeyUtils.createMasterKey();
+
+            pinHelper.setRegistrationLockPin(pin.get(), masterKey);
+

             account.setRegistrationLockPin(pin.get());
             account.setRegistrationLockPin(pin.get());

-            throw new RuntimeException("Not implemented anymore, will be replaced with KBS");
+            account.setPinMasterKey(masterKey);

         } else {
         } else {

-            account.setRegistrationLockPin(null);
+            // Remove legacy registration lock

             accountManager.removeRegistrationLockV1();
             accountManager.removeRegistrationLockV1();

+
+            // Remove KBS Pin
+            pinHelper.removeRegistrationLockPin();
+
+            account.setRegistrationLockPin(null);
+            account.setPinMasterKey(null);

         }
         account.save();
     }
         }
         account.save();
     }


@@ -528,45 +483,21 @@ public class Manager implements Closeable {
         accountManager.setPreKeys(identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
     }
 
         accountManager.setPreKeys(identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
     }
 

-    private SignalServiceMessageReceiver createMessageReceiver() {
-        final ClientZkProfileOperations clientZkProfileOperations = capabilities.isGv2() ? ClientZkOperations.create(
-                serviceConfiguration).getProfileOperations() : null;
-        return new SignalServiceMessageReceiver(serviceConfiguration,
-                account.getUuid(),
-                account.getUsername(),
-                account.getPassword(),
-                account.getDeviceId(),
-                account.getSignalingKey(),
-                userAgent,
-                null,
-                timer,
-                clientZkProfileOperations);
-    }
-
-    private SignalServiceMessageReceiver getOrCreateMessageReceiver() {
-        if (messageReceiver == null) {
-            messageReceiver = createMessageReceiver();
-        }
-        return messageReceiver;
-    }
-

     private SignalServiceMessagePipe getOrCreateMessagePipe() {
         if (messagePipe == null) {
     private SignalServiceMessagePipe getOrCreateMessagePipe() {
         if (messagePipe == null) {

-            messagePipe = getOrCreateMessageReceiver().createMessagePipe();
+            messagePipe = messageReceiver.createMessagePipe();

         }
         return messagePipe;
     }
 
     private SignalServiceMessagePipe getOrCreateUnidentifiedMessagePipe() {
         if (unidentifiedMessagePipe == null) {
         }
         return messagePipe;
     }
 
     private SignalServiceMessagePipe getOrCreateUnidentifiedMessagePipe() {
         if (unidentifiedMessagePipe == null) {

-            unidentifiedMessagePipe = getOrCreateMessageReceiver().createUnidentifiedMessagePipe();
+            unidentifiedMessagePipe = messageReceiver.createUnidentifiedMessagePipe();

         }
         return unidentifiedMessagePipe;
     }
 
     private SignalServiceMessageSender createMessageSender() {
         }
         return unidentifiedMessagePipe;
     }
 
     private SignalServiceMessageSender createMessageSender() {

-        final ClientZkProfileOperations clientZkProfileOperations = capabilities.isGv2() ? ClientZkOperations.create(
-                serviceConfiguration).getProfileOperations() : null;

         final ExecutorService executor = null;
         return new SignalServiceMessageSender(serviceConfiguration,
                 account.getUuid(),
         final ExecutorService executor = null;
         return new SignalServiceMessageSender(serviceConfiguration,
                 account.getUuid(),


@@ -714,7 +645,7 @@ public class Manager implements Closeable {
     }
 
     private GroupInfo getGroupForSending(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {
     }
 
     private GroupInfo getGroupForSending(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {

-        GroupInfo g = account.getGroupStore().getGroup(groupId);
+        GroupInfo g = getGroup(groupId);

         if (g == null) {
             throw new GroupNotFoundException(groupId);
         }
         if (g == null) {
             throw new GroupNotFoundException(groupId);
         }


@@ -725,7 +656,7 @@ public class Manager implements Closeable {
     }
 
     private GroupInfo getGroupForUpdating(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {
     }
 
     private GroupInfo getGroupForUpdating(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {

-        GroupInfo g = account.getGroupStore().getGroup(groupId);
+        GroupInfo g = getGroup(groupId);

         if (g == null) {
             throw new GroupNotFoundException(groupId);
         }
         if (g == null) {
             throw new GroupNotFoundException(groupId);
         }


@@ -1157,7 +1088,7 @@ public class Manager implements Closeable {
      * Change the expiration timer for a group
      */
     public void setExpirationTimer(GroupId groupId, int messageExpirationTimer) {
      * Change the expiration timer for a group
      */
     public void setExpirationTimer(GroupId groupId, int messageExpirationTimer) {

-        GroupInfo g = account.getGroupStore().getGroup(groupId);
+        GroupInfo g = getGroup(groupId);

         if (g instanceof GroupInfoV1) {
             GroupInfoV1 groupInfoV1 = (GroupInfoV1) g;
             groupInfoV1.messageExpirationTime = messageExpirationTimer;
         if (g instanceof GroupInfoV1) {
             GroupInfoV1 groupInfoV1 = (GroupInfoV1) g;
             groupInfoV1.messageExpirationTime = messageExpirationTimer;


@@ -1570,7 +1501,7 @@ public class Manager implements Closeable {
             if (message.getGroupContext().get().getGroupV1().isPresent()) {
                 SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();
                 GroupIdV1 groupId = GroupId.v1(groupInfo.getGroupId());
             if (message.getGroupContext().get().getGroupV1().isPresent()) {
                 SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();
                 GroupIdV1 groupId = GroupId.v1(groupInfo.getGroupId());

-                GroupInfo group = account.getGroupStore().getGroup(groupId);
+                GroupInfo group = getGroup(groupId);

                 if (group == null || group instanceof GroupInfoV1) {
                     GroupInfoV1 groupV1 = (GroupInfoV1) group;
                     switch (groupInfo.getType()) {
                 if (group == null || group instanceof GroupInfoV1) {
                     GroupInfoV1 groupV1 = (GroupInfoV1) group;
                     switch (groupInfo.getType()) {


@@ -1741,7 +1672,7 @@ public class Manager implements Closeable {
         final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
 
         GroupIdV2 groupId = GroupUtils.getGroupIdV2(groupSecretParams);
         final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
 
         GroupIdV2 groupId = GroupUtils.getGroupIdV2(groupSecretParams);

-        GroupInfo groupInfo = account.getGroupStore().getGroup(groupId);
+        GroupInfo groupInfo = getGroup(groupId);

         final GroupInfoV2 groupInfoV2;
         if (groupInfo instanceof GroupInfoV1) {
             // Received a v2 group message for a v1 group, we need to locally migrate the group
         final GroupInfoV2 groupInfoV2;
         if (groupInfo instanceof GroupInfoV1) {
             // Received a v2 group message for a v1 group, we need to locally migrate the group


@@ -1999,7 +1930,7 @@ public class Manager implements Closeable {
                     }
                 }
                 GroupId groupId = GroupUtils.getGroupId(message.getGroupContext().get());
                     }
                 }
                 GroupId groupId = GroupUtils.getGroupId(message.getGroupContext().get());

-                GroupInfo group = account.getGroupStore().getGroup(groupId);
+                GroupInfo group = getGroup(groupId);

                 if (group != null && group.isBlocked()) {
                     return true;
                 }
                 if (group != null && group.isBlocked()) {
                     return true;
                 }


@@ -2270,13 +2201,12 @@ public class Manager implements Closeable {
             GroupId groupId, GroupSecretParams groupSecretParams, String cdnKey
     ) throws IOException {
         IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());
             GroupId groupId, GroupSecretParams groupSecretParams, String cdnKey
     ) throws IOException {
         IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());

-        SignalServiceMessageReceiver receiver = getOrCreateMessageReceiver();

         File outputFile = getGroupAvatarFile(groupId);
         GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(groupSecretParams);
 
         File tmpFile = IOUtils.createTempFile();
         tmpFile.deleteOnExit();
         File outputFile = getGroupAvatarFile(groupId);
         GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(groupSecretParams);
 
         File tmpFile = IOUtils.createTempFile();
         tmpFile.deleteOnExit();

-        try (InputStream input = receiver.retrieveGroupsV2ProfileAvatar(cdnKey,
+        try (InputStream input = messageReceiver.retrieveGroupsV2ProfileAvatar(cdnKey,

                 tmpFile,
                 ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
             byte[] encryptedData = IOUtils.readFully(input);
                 tmpFile,
                 ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
             byte[] encryptedData = IOUtils.readFully(input);


@@ -2305,11 +2235,10 @@ public class Manager implements Closeable {
             SignalServiceAddress address, String avatarPath, ProfileKey profileKey
     ) throws IOException {
         IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());
             SignalServiceAddress address, String avatarPath, ProfileKey profileKey
     ) throws IOException {
         IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());

-        SignalServiceMessageReceiver receiver = getOrCreateMessageReceiver();

         File outputFile = getProfileAvatarFile(address);
 
         File tmpFile = IOUtils.createTempFile();
         File outputFile = getProfileAvatarFile(address);
 
         File tmpFile = IOUtils.createTempFile();

-        try (InputStream input = receiver.retrieveProfileAvatar(avatarPath,
+        try (InputStream input = messageReceiver.retrieveProfileAvatar(avatarPath,

                 tmpFile,
                 profileKey,
                 ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
                 tmpFile,
                 profileKey,
                 ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {


@@ -2350,8 +2279,6 @@ public class Manager implements Closeable {
             }
         }
 
             }
         }
 

-        final SignalServiceMessageReceiver messageReceiver = getOrCreateMessageReceiver();
-

         File tmpFile = IOUtils.createTempFile();
         try (InputStream input = messageReceiver.retrieveAttachment(pointer,
                 tmpFile,
         File tmpFile = IOUtils.createTempFile();
         try (InputStream input = messageReceiver.retrieveAttachment(pointer,
                 tmpFile,


@@ -2372,7 +2299,6 @@ public class Manager implements Closeable {
     private InputStream retrieveAttachmentAsStream(
             SignalServiceAttachmentPointer pointer, File tmpFile
     ) throws IOException, InvalidMessageException, MissingConfigurationException {
     private InputStream retrieveAttachmentAsStream(
             SignalServiceAttachmentPointer pointer, File tmpFile
     ) throws IOException, InvalidMessageException, MissingConfigurationException {

-        final SignalServiceMessageReceiver messageReceiver = getOrCreateMessageReceiver();

         return messageReceiver.retrieveAttachment(pointer, tmpFile, ServiceConfig.MAX_ATTACHMENT_SIZE);
     }
 
         return messageReceiver.retrieveAttachment(pointer, tmpFile, ServiceConfig.MAX_ATTACHMENT_SIZE);
     }
 


@@ -2382,7 +2308,7 @@ public class Manager implements Closeable {
         try {
             try (OutputStream fos = new FileOutputStream(groupsFile)) {
                 DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(fos);
         try {
             try (OutputStream fos = new FileOutputStream(groupsFile)) {
                 DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(fos);

-                for (GroupInfo record : account.getGroupStore().getGroups()) {
+                for (GroupInfo record : getGroups()) {

                     if (record instanceof GroupInfoV1) {
                         GroupInfoV1 groupInfo = (GroupInfoV1) record;
                         out.write(new DeviceGroup(groupInfo.getGroupId().serialize(),
                     if (record instanceof GroupInfoV1) {
                         GroupInfoV1 groupInfo = (GroupInfoV1) record;
                         out.write(new DeviceGroup(groupInfo.getGroupId().serialize(),


@@ -2491,7 +2417,7 @@ public class Manager implements Closeable {
             }
         }
         List<byte[]> groupIds = new ArrayList<>();
             }
         }
         List<byte[]> groupIds = new ArrayList<>();

-        for (GroupInfo record : account.getGroupStore().getGroups()) {
+        for (GroupInfo record : getGroups()) {

             if (record.isBlocked()) {
                 groupIds.add(record.getGroupId().serialize());
             }
             if (record.isBlocked()) {
                 groupIds.add(record.getGroupId().serialize());
             }


@@ -2518,7 +2444,13 @@ public class Manager implements Closeable {
     }
 
     public GroupInfo getGroup(GroupId groupId) {
     }
 
     public GroupInfo getGroup(GroupId groupId) {

-        return account.getGroupStore().getGroup(groupId);
+        final GroupInfo group = account.getGroupStore().getGroup(groupId);
+        if (group instanceof GroupInfoV2 && ((GroupInfoV2) group).getGroup() == null) {
+            final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(((GroupInfoV2) group).getMasterKey());
+            ((GroupInfoV2) group).setGroup(groupHelper.getDecryptedGroup(groupSecretParams));
+            account.getGroupStore().updateGroup(group);
+        }
+        return group;

     }
 
     public List<IdentityInfo> getIdentities() {
     }
 
     public List<IdentityInfo> getIdentities() {


@@ -2652,6 +2584,10 @@ public class Manager implements Closeable {
 
     @Override
     public void close() throws IOException {
 
     @Override
     public void close() throws IOException {

+        close(true);
+    }
+
+    void close(boolean closeAccount) throws IOException {

         if (messagePipe != null) {
             messagePipe.shutdown();
             messagePipe = null;
         if (messagePipe != null) {
             messagePipe.shutdown();
             messagePipe = null;


@@ -2662,7 +2598,10 @@ public class Manager implements Closeable {
             unidentifiedMessagePipe = null;
         }
 
             unidentifiedMessagePipe = null;
         }
 

-        account.close();
+        if (closeAccount && account != null) {
+            account.close();
+        }
+        account = null;

     }
 
     public interface ReceiveMessageHandler {
     }
 
     public interface ReceiveMessageHandler {