Command to check if number is registered (#391)

[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 f5bbe146fddacfbaf65b00514176660bbd840a1f..e964d21830694efb7a8ee07d6a5db140bd6a5ad8 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -16,20 +16,33 @@
  */
 package org.asamk.signal.manager;
 
  */
 package org.asamk.signal.manager;
 

-import org.asamk.Signal;
-import org.asamk.signal.AttachmentInvalidException;
-import org.asamk.signal.GroupNotFoundException;
-import org.asamk.signal.NotAGroupMemberException;
-import org.asamk.signal.TrustLevel;
-import org.asamk.signal.UserAlreadyExists;
-import org.asamk.signal.storage.SignalAccount;
-import org.asamk.signal.storage.contacts.ContactInfo;
-import org.asamk.signal.storage.groups.GroupInfo;
-import org.asamk.signal.storage.groups.JsonGroupStore;
-import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
-import org.asamk.signal.storage.threads.ThreadInfo;
-import org.asamk.signal.util.IOUtils;
-import org.asamk.signal.util.Util;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupIdV1;
+import org.asamk.signal.manager.groups.GroupIdV2;
+import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
+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.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.storage.contacts.ContactInfo;
+import org.asamk.signal.manager.storage.groups.GroupInfo;
+import org.asamk.signal.manager.storage.groups.GroupInfoV1;
+import org.asamk.signal.manager.storage.groups.GroupInfoV2;
+import org.asamk.signal.manager.storage.profiles.SignalProfile;
+import org.asamk.signal.manager.storage.profiles.SignalProfileEntry;
+import org.asamk.signal.manager.storage.protocol.IdentityInfo;
+import org.asamk.signal.manager.storage.stickers.Sticker;
+import org.asamk.signal.manager.util.AttachmentUtils;
+import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.asamk.signal.manager.util.MessageCacheUtils;
+import org.asamk.signal.manager.util.Utils;

 import org.signal.libsignal.metadata.InvalidMetadataMessageException;
 import org.signal.libsignal.metadata.InvalidMetadataVersionException;
 import org.signal.libsignal.metadata.ProtocolDuplicateMessageException;
 import org.signal.libsignal.metadata.InvalidMetadataMessageException;
 import org.signal.libsignal.metadata.InvalidMetadataVersionException;
 import org.signal.libsignal.metadata.ProtocolDuplicateMessageException;


@@ -41,10 +54,21 @@ import org.signal.libsignal.metadata.ProtocolLegacyMessageException;
 import org.signal.libsignal.metadata.ProtocolNoSessionException;
 import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
 import org.signal.libsignal.metadata.SelfSendException;
 import org.signal.libsignal.metadata.ProtocolNoSessionException;
 import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
 import org.signal.libsignal.metadata.SelfSendException;

-import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
+import org.signal.libsignal.metadata.certificate.CertificateValidator;
+import org.signal.storageservice.protos.groups.GroupChange;
+import org.signal.storageservice.protos.groups.local.DecryptedGroup;
+import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo;
+import org.signal.storageservice.protos.groups.local.DecryptedMember;

 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.VerificationFailedException;
 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.VerificationFailedException;

+import org.signal.zkgroup.auth.AuthCredentialResponse;
+import org.signal.zkgroup.groups.GroupMasterKey;
+import org.signal.zkgroup.groups.GroupSecretParams;
+import org.signal.zkgroup.profiles.ClientZkProfileOperations;

 import org.signal.zkgroup.profiles.ProfileKey;
 import org.signal.zkgroup.profiles.ProfileKey;

+import org.signal.zkgroup.profiles.ProfileKeyCredential;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;


@@ -59,6 +83,10 @@ 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.KbsPinData;
+import org.whispersystems.signalservice.api.KeyBackupService;
+import org.whispersystems.signalservice.api.KeyBackupServicePinException;
+import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException;

 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;


@@ -66,17 +94,27 @@ import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
 import org.whispersystems.signalservice.api.crypto.ProfileCipher;
 import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
 import org.whispersystems.signalservice.api.crypto.ProfileCipher;
 import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;

-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;

 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;

+import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
+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.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;

+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;

 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;

+import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
+import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifestUpload;
+import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifestUpload.StickerInfo;

 import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.ContactsMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceContact;
 import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.ContactsMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceContact;


@@ -89,22 +127,32 @@ import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo;
 import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;

+import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;

 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;

+import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;

 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
 import org.whispersystems.signalservice.api.push.ContactTokenDetails;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
 import org.whispersystems.signalservice.api.push.ContactTokenDetails;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;

-import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
-import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
-import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
-import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
+import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException;

 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;

+import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;

 import org.whispersystems.signalservice.api.util.SleepTimer;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.api.util.SleepTimer;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;

+import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
+import org.whispersystems.signalservice.internal.contacts.crypto.Quote;
+import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedQuoteException;
+import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
+import org.whispersystems.signalservice.internal.push.LockedException;

 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;
 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.util.Base64;
 

+import java.io.Closeable;

 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;


@@ -113,160 +161,263 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URI;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URI;

+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;

 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;

+import java.security.KeyStore;
+import java.security.SignatureException;

 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;

-import java.util.Collections;

 import java.util.Date;
 import java.util.Date;

+import java.util.HashMap;

 import java.util.HashSet;
 import java.util.HashSet;

-import java.util.LinkedList;

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

+import java.util.UUID;
+import java.util.concurrent.ExecutorService;

 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;

+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;

 
 

-public class Manager implements Signal {
+import static org.asamk.signal.manager.ServiceConfig.CDS_MRENCLAVE;
+import static org.asamk.signal.manager.ServiceConfig.capabilities;
+import static org.asamk.signal.manager.ServiceConfig.getIasKeyStore;

 
 

-    private static final SignalServiceProfile.Capabilities capabilities = new SignalServiceProfile.Capabilities(false, false);
+public class Manager implements Closeable {
+
+    final static Logger logger = LoggerFactory.getLogger(Manager.class);

 
 

-    private final String settingsPath;
-    private final String dataPath;
-    private final String attachmentsPath;
-    private final String avatarsPath;

     private final SleepTimer timer = new UptimeSleepTimer();
     private final SleepTimer timer = new UptimeSleepTimer();

+    private final CertificateValidator certificateValidator = new CertificateValidator(ServiceConfig.getUnidentifiedSenderTrustRoot());
+
+    private final SignalServiceConfiguration serviceConfiguration;
+    private final String userAgent;
+
+    // TODO make configurable
+    private final boolean discoverableByPhoneNumber = true;
+    private final boolean unrestrictedUnidentifiedAccess = false;

 
 

-    private SignalAccount account;
-    private String username;
+    private final SignalAccount account;
+    private final PathConfig pathConfig;

     private SignalServiceAccountManager accountManager;
     private SignalServiceAccountManager accountManager;

+    private GroupsV2Api groupsV2Api;
+    private final GroupsV2Operations groupsV2Operations;
+
+    private SignalServiceMessageReceiver messageReceiver = null;

     private SignalServiceMessagePipe messagePipe = null;
     private SignalServiceMessagePipe unidentifiedMessagePipe = null;
 
     private SignalServiceMessagePipe messagePipe = null;
     private SignalServiceMessagePipe unidentifiedMessagePipe = null;
 

-    public Manager(String username, String settingsPath) {
-        this.username = username;
-        this.settingsPath = settingsPath;
-        this.dataPath = this.settingsPath + "/data";
-        this.attachmentsPath = this.settingsPath + "/attachments";
-        this.avatarsPath = this.settingsPath + "/avatars";
-
+    private final UnidentifiedAccessHelper unidentifiedAccessHelper;
+    private final ProfileHelper profileHelper;
+    private final GroupHelper groupHelper;
+    private PinHelper pinHelper;
+
+    Manager(
+            SignalAccount account,
+            PathConfig pathConfig,
+            SignalServiceConfiguration serviceConfiguration,
+            String userAgent
+    ) {
+        this.account = account;
+        this.pathConfig = pathConfig;
+        this.serviceConfiguration = serviceConfiguration;
+        this.userAgent = userAgent;
+        this.groupsV2Operations = capabilities.isGv2() ? new GroupsV2Operations(ClientZkOperations.create(
+                serviceConfiguration)) : null;
+        createSignalServiceAccountManager();
+
+        this.account.setResolver(this::resolveSignalServiceAddress);
+
+        this.unidentifiedAccessHelper = new UnidentifiedAccessHelper(account::getProfileKey,
+                account.getProfileStore()::getProfileKey,
+                this::getRecipientProfile,
+                this::getSenderCertificate);
+        this.profileHelper = new ProfileHelper(account.getProfileStore()::getProfileKey,
+                unidentifiedAccessHelper::getAccessFor,
+                unidentified -> unidentified ? getOrCreateUnidentifiedMessagePipe() : getOrCreateMessagePipe(),
+                this::getOrCreateMessageReceiver);
+        this.groupHelper = new GroupHelper(this::getRecipientProfileKeyCredential,
+                this::getRecipientProfile,
+                account::getSelfAddress,
+                groupsV2Operations,
+                groupsV2Api,
+                this::getGroupAuthForToday);

     }
 
     public String getUsername() {
     }
 
     public String getUsername() {

-        return username;
+        return account.getUsername();
+    }
+
+    public SignalServiceAddress getSelfAddress() {
+        return account.getSelfAddress();

     }
 
     }
 

-    private SignalServiceAddress getSelfAddress() {
-        return new SignalServiceAddress(null, username);
+    private void createSignalServiceAccountManager() {
+        this.accountManager = new SignalServiceAccountManager(serviceConfiguration,
+                new DynamicCredentialsProvider(account.getUuid(),
+                        account.getUsername(),
+                        account.getPassword(),
+                        null,
+                        account.getDeviceId()),
+                userAgent,
+                groupsV2Operations,
+                timer);
+        this.groupsV2Api = accountManager.getGroupsV2Api();
+        this.pinHelper = new PinHelper(createKeyBackupService());

     }
 
     }
 

-    private SignalServiceAccountManager getSignalServiceAccountManager() {
-        return new SignalServiceAccountManager(BaseConfig.serviceConfiguration, null, account.getUsername(), account.getPassword(), account.getDeviceId(), BaseConfig.USER_AGENT, timer);
+    private KeyBackupService createKeyBackupService() {
+        KeyStore keyStore = ServiceConfig.getIasKeyStore();
+
+        return accountManager.getKeyBackupService(keyStore,
+                ServiceConfig.KEY_BACKUP_ENCLAVE_NAME,
+                ServiceConfig.KEY_BACKUP_SERVICE_ID,
+                ServiceConfig.KEY_BACKUP_MRENCLAVE,
+                10);

     }
 
     }
 

-    private IdentityKey getIdentity() {
-        return account.getSignalProtocolStore().getIdentityKeyPair().getPublicKey();
+    private IdentityKeyPair getIdentityKeyPair() {
+        return account.getSignalProtocolStore().getIdentityKeyPair();

     }
 
     public int getDeviceId() {
         return account.getDeviceId();
     }
 
     }
 
     public int getDeviceId() {
         return account.getDeviceId();
     }
 

-    private String getMessageCachePath() {
-        return this.dataPath + "/" + username + ".d/msg-cache";
+    private File getMessageCachePath() {
+        return SignalAccount.getMessageCachePath(pathConfig.getDataPath(), account.getUsername());

     }
 
     }
 

-    private String getMessageCachePath(String sender) {
-        return getMessageCachePath() + "/" + sender.replace("/", "_");
+    private File getMessageCachePath(String sender) {
+        if (sender == null || sender.isEmpty()) {
+            return getMessageCachePath();
+        }
+
+        return new File(getMessageCachePath(), sender.replace("/", "_"));

     }
 
     private File getMessageCacheFile(String sender, long now, long timestamp) throws IOException {
     }
 
     private File getMessageCacheFile(String sender, long now, long timestamp) throws IOException {

-        String cachePath = getMessageCachePath(sender);
+        File cachePath = getMessageCachePath(sender);

         IOUtils.createPrivateDirectories(cachePath);
         IOUtils.createPrivateDirectories(cachePath);

-        return new File(cachePath + "/" + now + "_" + timestamp);
+        return new File(cachePath, now + "_" + timestamp);

     }
 
     }
 

-    public boolean userHasKeys() {
-        return account != null && account.getSignalProtocolStore() != null;
-    }
+    public static Manager init(
+            String username, File settingsPath, SignalServiceConfiguration serviceConfiguration, String userAgent
+    ) throws IOException {
+        PathConfig pathConfig = PathConfig.createDefault(settingsPath);

 
 

-    public void init() throws IOException {
-        if (!SignalAccount.userExists(dataPath, username)) {
-            return;
-        }
-        account = SignalAccount.load(dataPath, username);
+        if (!SignalAccount.userExists(pathConfig.getDataPath(), username)) {
+            IdentityKeyPair identityKey = KeyHelper.generateIdentityKeyPair();
+            int registrationId = KeyHelper.generateRegistrationId(false);

 
 

-        migrateLegacyConfigs();
+            ProfileKey profileKey = KeyUtils.createProfileKey();
+            SignalAccount account = SignalAccount.create(pathConfig.getDataPath(),
+                    username,
+                    identityKey,
+                    registrationId,
+                    profileKey);
+            account.save();

 
 

-        accountManager = getSignalServiceAccountManager();
-        try {
-            if (account.isRegistered() && accountManager.getPreKeysCount() < BaseConfig.PREKEY_MINIMUM_COUNT) {
-                refreshPreKeys();
-                account.save();
-            }
-        } catch (AuthorizationFailedException e) {
-            System.err.println("Authorization failed, was the number registered elsewhere?");
-            throw e;
+            return new Manager(account, pathConfig, serviceConfiguration, userAgent);

         }
         }

+
+        SignalAccount account = SignalAccount.load(pathConfig.getDataPath(), username);
+
+        Manager m = new Manager(account, pathConfig, serviceConfiguration, userAgent);
+
+        m.migrateLegacyConfigs();
+
+        return m;

     }
 
     private void migrateLegacyConfigs() {
     }
 
     private void migrateLegacyConfigs() {

-        // Copy group avatars that were previously stored in the attachments folder
-        // to the new avatar folder
-        if (JsonGroupStore.groupsWithLegacyAvatarId.size() > 0) {
-            for (GroupInfo g : JsonGroupStore.groupsWithLegacyAvatarId) {
-                File avatarFile = getGroupAvatarFile(g.groupId);
-                File attachmentFile = getAttachmentFile(g.getAvatarId());
-                if (!avatarFile.exists() && attachmentFile.exists()) {
-                    try {
-                        IOUtils.createPrivateDirectories(avatarsPath);
-                        Files.copy(attachmentFile.toPath(), avatarFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-                    } catch (Exception e) {
-                        // Ignore
-                    }
-                }
-            }
-            JsonGroupStore.groupsWithLegacyAvatarId.clear();
-            account.save();
-        }
-        if (account.getProfileKey() == null) {
+        if (account.getProfileKey() == null && isRegistered()) {

             // Old config file, creating new profile key
             account.setProfileKey(KeyUtils.createProfileKey());
             account.save();
         }
             // 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);
+        }
+        // Ensure our profile key is stored in profile store
+        account.getProfileStore().storeProfileKey(getSelfAddress(), account.getProfileKey());

     }
 
     }
 

-    private void createNewIdentity() throws IOException {
-        IdentityKeyPair identityKey = KeyHelper.generateIdentityKeyPair();
-        int registrationId = KeyHelper.generateRegistrationId(false);
-        if (username == null) {
-            account = SignalAccount.createTemporaryAccount(identityKey, registrationId);
-        } else {
-            ProfileKey profileKey = KeyUtils.createProfileKey();
-            account = SignalAccount.create(dataPath, username, identityKey, registrationId, profileKey);
-            account.save();
+    public void checkAccountState() throws IOException {
+        if (account.isRegistered()) {
+            if (accountManager.getPreKeysCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+                refreshPreKeys();
+                account.save();
+            }
+            if (account.getUuid() == null) {
+                account.setUuid(accountManager.getOwnUuid());
+                account.save();
+            }
+            updateAccountAttributes();

         }
     }
 
     public boolean isRegistered() {
         }
     }
 
     public boolean isRegistered() {

-        return account != null && account.isRegistered();
+        return account.isRegistered();

     }
 
     }
 

-    public void register(boolean voiceVerification) throws IOException {
-        if (account == null) {
-            createNewIdentity();
+    /**
+     * 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);
+
+        // Make the initial map with all numbers set to false for now
+        Map<String, Boolean> usersRegistered = numbers.stream().collect(Collectors.toMap(x -> x, x -> false));
+
+        // Override the contacts we did obtain
+        for (ContactTokenDetails contactDetail : contactDetails) {
+            usersRegistered.put(contactDetail.getNumber(), true);

         }
         }

+
+        return usersRegistered;
+    }
+
+    public void register(boolean voiceVerification, String captcha) throws IOException {

         account.setPassword(KeyUtils.createPassword());
         account.setPassword(KeyUtils.createPassword());

-        accountManager = getSignalServiceAccountManager();
+
+        // Resetting UUID, because registering doesn't work otherwise
+        account.setUuid(null);
+        createSignalServiceAccountManager();

 
         if (voiceVerification) {
 
         if (voiceVerification) {

-            accountManager.requestVoiceVerificationCode(Locale.getDefault(), Optional.absent(), Optional.absent());
+            accountManager.requestVoiceVerificationCode(Locale.getDefault(),
+                    Optional.fromNullable(captcha),
+                    Optional.absent());

         } else {
         } else {

-            accountManager.requestSmsVerificationCode(false, Optional.absent(), Optional.absent());
+            accountManager.requestSmsVerificationCode(false, Optional.fromNullable(captcha), Optional.absent());

         }
 
         account.setRegistered(false);
         }
 
         account.setRegistered(false);


@@ -274,21 +425,22 @@ public class Manager implements Signal {
     }
 
     public void updateAccountAttributes() throws IOException {
     }
 
     public void updateAccountAttributes() throws IOException {

-        accountManager.setAccountAttributes(account.getSignalingKey(), account.getSignalProtocolStore().getLocalRegistrationId(), true, account.getRegistrationLockPin(), account.getRegistrationLock(), getSelfUnidentifiedAccessKey(), false, capabilities);
-    }
-
-    public void setProfileName(String name) throws IOException {
-        accountManager.setProfileName(account.getProfileKey(), name);
+        accountManager.setAccountAttributes(account.getSignalingKey(),
+                account.getSignalProtocolStore().getLocalRegistrationId(),
+                true,
+                // set legacy pin only if no KBS master key is set
+                account.getPinMasterKey() == null ? account.getRegistrationLockPin() : null,
+                account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(),
+                unidentifiedAccessHelper.getSelfUnidentifiedAccessKey(),
+                unrestrictedUnidentifiedAccess,
+                capabilities,
+                discoverableByPhoneNumber);

     }
 
     }
 

-    public void setProfileAvatar(File avatar) throws IOException {
-        final StreamDetails streamDetails = Utils.createStreamDetailsFromFile(avatar);
-        accountManager.setProfileAvatar(account.getProfileKey(), streamDetails);
-        streamDetails.getStream().close();
-    }
-
-    public void removeProfileAvatar() throws IOException {
-        accountManager.setProfileAvatar(account.getProfileKey(), null);
+    public void setProfile(String name, File avatar) throws IOException {
+        try (final StreamDetails streamDetails = avatar == null ? null : Utils.createStreamDetailsFromFile(avatar)) {
+            accountManager.setVersionedProfile(account.getUuid(), account.getProfileKey(), name, streamDetails);
+        }

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


@@ -301,51 +453,6 @@ public class Manager implements Signal {
         account.save();
     }
 
         account.save();
     }
 

-    public String getDeviceLinkUri() throws TimeoutException, IOException {
-        if (account == null) {
-            createNewIdentity();
-        }
-        account.setPassword(KeyUtils.createPassword());
-        accountManager = getSignalServiceAccountManager();
-        String uuid = accountManager.getNewDeviceUuid();
-
-        return Utils.createDeviceLinkUri(new Utils.DeviceLinkInfo(uuid, getIdentity().getPublicKey()));
-    }
-
-    public void finishDeviceLink(String deviceName) throws IOException, InvalidKeyException, TimeoutException, UserAlreadyExists {
-        account.setSignalingKey(KeyUtils.createSignalingKey());
-        SignalServiceAccountManager.NewDeviceRegistrationReturn ret = accountManager.finishNewDeviceRegistration(account.getSignalProtocolStore().getIdentityKeyPair(), account.getSignalingKey(), false, true, account.getSignalProtocolStore().getLocalRegistrationId(), deviceName);
-
-        username = ret.getNumber();
-        // TODO do this check before actually registering
-        if (SignalAccount.userExists(dataPath, username)) {
-            throw new UserAlreadyExists(username, SignalAccount.getFileName(dataPath, username));
-        }
-
-        // Create new account with the synced identity
-        byte[] profileKeyBytes = ret.getProfileKey();
-        ProfileKey profileKey;
-        if (profileKeyBytes == null) {
-            profileKey = KeyUtils.createProfileKey();
-        } else {
-            try {
-                profileKey = new ProfileKey(profileKeyBytes);
-            } catch (InvalidInputException e) {
-                throw new IOException("Received invalid profileKey", e);
-            }
-        }
-        account = SignalAccount.createLinkedAccount(dataPath, username, account.getPassword(), ret.getDeviceId(), ret.getIdentity(), account.getSignalProtocolStore().getLocalRegistrationId(), account.getSignalingKey(), profileKey);
-
-        refreshPreKeys();
-
-        requestSyncGroups();
-        requestSyncContacts();
-        requestSyncBlocked();
-        requestSyncConfiguration();
-
-        account.save();
-    }
-

     public List<DeviceInfo> getLinkedDevices() throws IOException {
         List<DeviceInfo> devices = accountManager.getDevices();
         account.setMultiDevice(devices.size() > 1);
     public List<DeviceInfo> getLinkedDevices() throws IOException {
         List<DeviceInfo> devices = accountManager.getDevices();
         account.setMultiDevice(devices.size() > 1);


@@ -361,25 +468,29 @@ public class Manager implements Signal {
     }
 
     public void addDeviceLink(URI linkUri) throws IOException, InvalidKeyException {
     }
 
     public void addDeviceLink(URI linkUri) throws IOException, InvalidKeyException {

-        Utils.DeviceLinkInfo info = Utils.parseDeviceLinkUri(linkUri);
+        DeviceLinkInfo info = DeviceLinkInfo.parseDeviceLinkUri(linkUri);

 
         addDevice(info.deviceIdentifier, info.deviceKey);
     }
 
     private void addDevice(String deviceIdentifier, ECPublicKey deviceKey) throws IOException, InvalidKeyException {
 
         addDevice(info.deviceIdentifier, info.deviceKey);
     }
 
     private void addDevice(String deviceIdentifier, ECPublicKey deviceKey) throws IOException, InvalidKeyException {

-        IdentityKeyPair identityKeyPair = account.getSignalProtocolStore().getIdentityKeyPair();
+        IdentityKeyPair identityKeyPair = getIdentityKeyPair();

         String verificationCode = accountManager.getNewDeviceVerificationCode();
 
         String verificationCode = accountManager.getNewDeviceVerificationCode();
 

-        accountManager.addDevice(deviceIdentifier, deviceKey, identityKeyPair, Optional.of(account.getProfileKey().serialize()), verificationCode);
+        accountManager.addDevice(deviceIdentifier,
+                deviceKey,
+                identityKeyPair,
+                Optional.of(account.getProfileKey().serialize()),
+                verificationCode);

         account.setMultiDevice(true);
         account.save();
     }
 
     private List<PreKeyRecord> generatePreKeys() {
         account.setMultiDevice(true);
         account.save();
     }
 
     private List<PreKeyRecord> generatePreKeys() {

-        List<PreKeyRecord> records = new ArrayList<>(BaseConfig.PREKEY_BATCH_SIZE);
+        List<PreKeyRecord> records = new ArrayList<>(ServiceConfig.PREKEY_BATCH_SIZE);

 
         final int offset = account.getPreKeyIdOffset();
 
         final int offset = account.getPreKeyIdOffset();

-        for (int i = 0; i < BaseConfig.PREKEY_BATCH_SIZE; i++) {
+        for (int i = 0; i < ServiceConfig.PREKEY_BATCH_SIZE; i++) {

             int preKeyId = (offset + i) % Medium.MAX_VALUE;
             ECKeyPair keyPair = Curve.generateKeyPair();
             PreKeyRecord record = new PreKeyRecord(preKeyId, keyPair);
             int preKeyId = (offset + i) % Medium.MAX_VALUE;
             ECKeyPair keyPair = Curve.generateKeyPair();
             PreKeyRecord record = new PreKeyRecord(preKeyId, keyPair);


@@ -396,8 +507,12 @@ public class Manager implements Signal {
     private SignedPreKeyRecord generateSignedPreKey(IdentityKeyPair identityKeyPair) {
         try {
             ECKeyPair keyPair = Curve.generateKeyPair();
     private SignedPreKeyRecord generateSignedPreKey(IdentityKeyPair identityKeyPair) {
         try {
             ECKeyPair keyPair = Curve.generateKeyPair();

-            byte[] signature = Curve.calculateSignature(identityKeyPair.getPrivateKey(), keyPair.getPublicKey().serialize());
-            SignedPreKeyRecord record = new SignedPreKeyRecord(account.getNextSignedPreKeyId(), System.currentTimeMillis(), keyPair, signature);
+            byte[] signature = Curve.calculateSignature(identityKeyPair.getPrivateKey(),
+                    keyPair.getPublicKey().serialize());
+            SignedPreKeyRecord record = new SignedPreKeyRecord(account.getNextSignedPreKeyId(),
+                    System.currentTimeMillis(),
+                    keyPair,
+                    signature);

 
             account.addSignedPreKey(record);
             account.save();
 
             account.addSignedPreKey(record);
             account.save();


@@ -408,74 +523,269 @@ public class Manager implements Signal {
         }
     }
 
         }
     }
 

-    public void verifyAccount(String verificationCode, String pin) throws IOException {
+    public void verifyAccount(
+            String verificationCode,
+            String pin
+    ) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {

         verificationCode = verificationCode.replace("-", "");
         account.setSignalingKey(KeyUtils.createSignalingKey());
         verificationCode = verificationCode.replace("-", "");
         account.setSignalingKey(KeyUtils.createSignalingKey());

-        // TODO make unrestricted unidentified access configurable
-        accountManager.verifyAccountWithCode(verificationCode, account.getSignalingKey(), account.getSignalProtocolStore().getLocalRegistrationId(), true, pin, null, getSelfUnidentifiedAccessKey(), false, capabilities);
+        VerifyAccountResponse response;
+        try {
+            response = verifyAccountWithCode(verificationCode, pin, null);
+        } catch (LockedException e) {
+            if (pin == null) {
+                throw e;
+            }

 
 

+            KbsPinData registrationLockData = pinHelper.getRegistrationLockData(pin, e);
+            if (registrationLockData == null) {
+                throw e;
+            }
+
+            String registrationLock = registrationLockData.getMasterKey().deriveRegistrationLock();
+            try {
+                response = verifyAccountWithCode(verificationCode, null, registrationLock);
+            } catch (LockedException _e) {
+                throw new AssertionError("KBS Pin appeared to matched but reg lock still failed!");
+            }
+            account.setPinMasterKey(registrationLockData.getMasterKey());
+        }
+
+        // TODO response.isStorageCapable()

         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));

+

         account.setRegistered(true);
         account.setRegistered(true);

+        account.setUuid(UuidUtil.parseOrNull(response.getUuid()));

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

+        account.getSignalProtocolStore()
+                .saveIdentity(account.getSelfAddress(),
+                        getIdentityKeyPair().getPublicKey(),
+                        TrustLevel.TRUSTED_VERIFIED);

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

-    public void setRegistrationLockPin(Optional<String> pin) throws IOException {
+    private VerifyAccountResponse verifyAccountWithCode(
+            final String verificationCode, final String legacyPin, final String registrationLock
+    ) throws IOException {
+        return accountManager.verifyAccountWithCode(verificationCode,
+                account.getSignalingKey(),
+                account.getSignalProtocolStore().getLocalRegistrationId(),
+                true,
+                legacyPin,
+                registrationLock,
+                unidentifiedAccessHelper.getSelfUnidentifiedAccessKey(),
+                unrestrictedUnidentifiedAccess,
+                capabilities,
+                discoverableByPhoneNumber);
+    }
+
+    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 {

+            // Remove legacy registration lock
+            accountManager.removeRegistrationLockV1();
+
+            // Remove KBS Pin
+            pinHelper.removeRegistrationLockPin();
+

             account.setRegistrationLockPin(null);
             account.setRegistrationLockPin(null);

-            accountManager.removeV1Pin();
+            account.setPinMasterKey(null);

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

-    private void refreshPreKeys() throws IOException {
+    void refreshPreKeys() throws IOException {

         List<PreKeyRecord> oneTimePreKeys = generatePreKeys();
         List<PreKeyRecord> oneTimePreKeys = generatePreKeys();

-        final IdentityKeyPair identityKeyPair = account.getSignalProtocolStore().getIdentityKeyPair();
+        final IdentityKeyPair identityKeyPair = getIdentityKeyPair();

         SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(identityKeyPair);
 
         SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(identityKeyPair);
 

-        accountManager.setPreKeys(getIdentity(), signedPreKeyRecord, oneTimePreKeys);
+        accountManager.setPreKeys(identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);

     }
 
     }
 

-    private SignalServiceMessageReceiver getMessageReceiver() {
-        return new SignalServiceMessageReceiver(BaseConfig.serviceConfiguration, null, username, account.getPassword(), account.getDeviceId(), account.getSignalingKey(), BaseConfig.USER_AGENT, null, timer);
+    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 SignalServiceMessageSender getMessageSender() {
-        return new SignalServiceMessageSender(BaseConfig.serviceConfiguration, null, username, account.getPassword(),
-                account.getDeviceId(), account.getSignalProtocolStore(), BaseConfig.USER_AGENT, account.isMultiDevice(), Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.absent());
+    private SignalServiceMessageReceiver getOrCreateMessageReceiver() {
+        if (messageReceiver == null) {
+            messageReceiver = createMessageReceiver();
+        }
+        return messageReceiver;

     }
 
     }
 

-    private SignalServiceProfile getRecipientProfile(SignalServiceAddress address, Optional<UnidentifiedAccess> unidentifiedAccess) throws IOException {
-        SignalServiceMessagePipe pipe = unidentifiedMessagePipe != null && unidentifiedAccess.isPresent() ? unidentifiedMessagePipe
-                : messagePipe;
+    private SignalServiceMessagePipe getOrCreateMessagePipe() {
+        if (messagePipe == null) {
+            messagePipe = getOrCreateMessageReceiver().createMessagePipe();
+        }
+        return messagePipe;
+    }

 
 

-        if (pipe != null) {
+    private SignalServiceMessagePipe getOrCreateUnidentifiedMessagePipe() {
+        if (unidentifiedMessagePipe == null) {
+            unidentifiedMessagePipe = getOrCreateMessageReceiver().createUnidentifiedMessagePipe();
+        }
+        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(),
+                account.getUsername(),
+                account.getPassword(),
+                account.getDeviceId(),
+                account.getSignalProtocolStore(),
+                userAgent,
+                account.isMultiDevice(),
+                Optional.fromNullable(messagePipe),
+                Optional.fromNullable(unidentifiedMessagePipe),
+                Optional.absent(),
+                clientZkProfileOperations,
+                executor,
+                ServiceConfig.MAX_ENVELOPE_SIZE);
+    }
+
+    private SignalServiceProfile getEncryptedRecipientProfile(SignalServiceAddress address) throws IOException {
+        return profileHelper.retrieveProfileSync(address, SignalServiceProfile.RequestType.PROFILE).getProfile();
+    }
+
+    private SignalProfile getRecipientProfile(
+            SignalServiceAddress address
+    ) {
+        SignalProfileEntry profileEntry = account.getProfileStore().getProfileEntry(address);
+        if (profileEntry == null) {
+            return null;
+        }
+        long now = new Date().getTime();
+        // Profiles are cache for 24h before retrieving them again
+        if (!profileEntry.isRequestPending() && (
+                profileEntry.getProfile() == null || now - profileEntry.getLastUpdateTimestamp() > 24 * 60 * 60 * 1000
+        )) {
+            ProfileKey profileKey = profileEntry.getProfileKey();
+            profileEntry.setRequestPending(true);
+            SignalProfile profile;

             try {
             try {

-                return pipe.getProfile(address, Optional.absent(), unidentifiedAccess, SignalServiceProfile.RequestType.PROFILE).getProfile();
-            } catch (IOException ignored) {
+                profile = retrieveRecipientProfile(address, profileKey);
+            } catch (IOException e) {
+                logger.warn("Failed to retrieve profile, ignoring: {}", e.getMessage());
+                profileEntry.setRequestPending(false);
+                return null;

             }
             }

+            profileEntry.setRequestPending(false);
+            account.getProfileStore()
+                    .updateProfile(address, profileKey, now, profile, profileEntry.getProfileKeyCredential());
+            return profile;

         }
         }

+        return profileEntry.getProfile();
+    }
+
+    private ProfileKeyCredential getRecipientProfileKeyCredential(SignalServiceAddress address) {
+        SignalProfileEntry profileEntry = account.getProfileStore().getProfileEntry(address);
+        if (profileEntry == null) {
+            return null;
+        }
+        if (profileEntry.getProfileKeyCredential() == null) {
+            ProfileAndCredential profileAndCredential;
+            try {
+                profileAndCredential = profileHelper.retrieveProfileSync(address,
+                        SignalServiceProfile.RequestType.PROFILE_AND_CREDENTIAL);
+            } catch (IOException e) {
+                logger.warn("Failed to retrieve profile key credential, ignoring: {}", e.getMessage());
+                return null;
+            }
+
+            long now = new Date().getTime();
+            final ProfileKeyCredential profileKeyCredential = profileAndCredential.getProfileKeyCredential().orNull();
+            final SignalProfile profile = decryptProfile(address,
+                    profileEntry.getProfileKey(),
+                    profileAndCredential.getProfile());
+            account.getProfileStore()
+                    .updateProfile(address, profileEntry.getProfileKey(), now, profile, profileKeyCredential);
+            return profileKeyCredential;
+        }
+        return profileEntry.getProfileKeyCredential();
+    }
+
+    private SignalProfile retrieveRecipientProfile(
+            SignalServiceAddress address, ProfileKey profileKey
+    ) throws IOException {
+        final SignalServiceProfile encryptedProfile = getEncryptedRecipientProfile(address);

 
 

-        SignalServiceMessageReceiver receiver = getMessageReceiver();
+        return decryptProfile(address, profileKey, encryptedProfile);
+    }
+
+    private SignalProfile decryptProfile(
+            final SignalServiceAddress address, final ProfileKey profileKey, final SignalServiceProfile encryptedProfile
+    ) {
+        File avatarFile = null;

         try {
         try {

-            return receiver.retrieveProfile(address, Optional.absent(), unidentifiedAccess, SignalServiceProfile.RequestType.PROFILE).getProfile();
-        } catch (VerificationFailedException e) {
-            throw new AssertionError(e);
+            avatarFile = encryptedProfile.getAvatar() == null
+                    ? null
+                    : retrieveProfileAvatar(address, encryptedProfile.getAvatar(), profileKey);
+        } catch (Throwable e) {
+            logger.warn("Failed to retrieve profile avatar, ignoring: {}", e.getMessage());
+        }
+
+        ProfileCipher profileCipher = new ProfileCipher(profileKey);
+        try {
+            String name;
+            try {
+                name = encryptedProfile.getName() == null
+                        ? null
+                        : new String(profileCipher.decryptName(Base64.decode(encryptedProfile.getName())));
+            } catch (IOException e) {
+                name = null;
+            }
+            String unidentifiedAccess;
+            try {
+                unidentifiedAccess = encryptedProfile.getUnidentifiedAccess() == null
+                        || !profileCipher.verifyUnidentifiedAccess(Base64.decode(encryptedProfile.getUnidentifiedAccess()))
+                        ? null
+                        : encryptedProfile.getUnidentifiedAccess();
+            } catch (IOException e) {
+                unidentifiedAccess = null;
+            }
+            return new SignalProfile(encryptedProfile.getIdentityKey(),
+                    name,
+                    avatarFile,
+                    unidentifiedAccess,
+                    encryptedProfile.isUnrestrictedUnidentifiedAccess(),
+                    encryptedProfile.getCapabilities());
+        } catch (InvalidCiphertextException e) {
+            return null;

         }
     }
 
         }
     }
 

-    private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException {
+    private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(GroupId groupId) throws IOException {

         File file = getGroupAvatarFile(groupId);
         if (!file.exists()) {
             return Optional.absent();
         }
 
         File file = getGroupAvatarFile(groupId);
         if (!file.exists()) {
             return Optional.absent();
         }
 

-        return Optional.of(Utils.createAttachment(file));
+        return Optional.of(AttachmentUtils.createAttachment(file));

     }
 
     private Optional<SignalServiceAttachmentStream> createContactAvatarAttachment(String number) throws IOException {
     }
 
     private Optional<SignalServiceAttachmentStream> createContactAvatarAttachment(String number) throws IOException {


@@ -484,231 +794,327 @@ public class Manager implements Signal {
             return Optional.absent();
         }
 
             return Optional.absent();
         }
 

-        return Optional.of(Utils.createAttachment(file));
+        return Optional.of(AttachmentUtils.createAttachment(file));

     }
 
     }
 

-    private GroupInfo getGroupForSending(byte[] groupId) throws GroupNotFoundException, NotAGroupMemberException {
+    private GroupInfo getGroupForSending(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {

         GroupInfo g = account.getGroupStore().getGroup(groupId);
         if (g == null) {
             throw new GroupNotFoundException(groupId);
         }
         GroupInfo g = account.getGroupStore().getGroup(groupId);
         if (g == null) {
             throw new GroupNotFoundException(groupId);
         }

-        for (String member : g.members) {
-            if (member.equals(this.username)) {
-                return g;
-            }
+        if (!g.isMember(account.getSelfAddress())) {
+            throw new NotAGroupMemberException(groupId, g.getTitle());

         }
         }

-        throw new NotAGroupMemberException(groupId, g.name);
+        return g;
+    }
+
+    private GroupInfo getGroupForUpdating(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {
+        GroupInfo g = account.getGroupStore().getGroup(groupId);
+        if (g == null) {
+            throw new GroupNotFoundException(groupId);
+        }
+        if (!g.isMember(account.getSelfAddress()) && !g.isPendingMember(account.getSelfAddress())) {
+            throw new NotAGroupMemberException(groupId, g.getTitle());
+        }
+        return g;

     }
 
     public List<GroupInfo> getGroups() {
         return account.getGroupStore().getGroups();
     }
 
     }
 
     public List<GroupInfo> getGroups() {
         return account.getGroupStore().getGroups();
     }
 

-    @Override
-    public void sendGroupMessage(String messageText, List<String> attachments,
-                                 byte[] groupId)
-            throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
-        final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
-        if (attachments != null) {
-            messageBuilder.withAttachments(Utils.getSignalServiceAttachments(attachments));
-        }
-        if (groupId != null) {
-            SignalServiceGroup group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.DELIVER)
-                    .withId(groupId)
-                    .build();
-            messageBuilder.asGroupMessage(group);
-        }
-        ThreadInfo thread = account.getThreadStore().getThread(Base64.encodeBytes(groupId));
-        if (thread != null) {
-            messageBuilder.withExpiration(thread.messageExpirationTime);
-        }
-
+    public Pair<Long, List<SendMessageResult>> sendGroupMessage(
+            SignalServiceDataMessage.Builder messageBuilder, GroupId groupId
+    ) throws IOException, GroupNotFoundException, NotAGroupMemberException {

         final GroupInfo g = getGroupForSending(groupId);
 
         final GroupInfo g = getGroupForSending(groupId);
 

-        // Don't send group message to ourself
-        final List<String> membersSend = new ArrayList<>(g.members);
-        membersSend.remove(this.username);
-        sendMessageLegacy(messageBuilder, membersSend);
+        GroupUtils.setGroupContext(messageBuilder, g);
+        messageBuilder.withExpiration(g.getMessageExpirationTime());
+
+        return sendMessage(messageBuilder, g.getMembersWithout(account.getSelfAddress()));

     }
 
     }
 

-    public void sendGroupMessageReaction(String emoji, boolean remove, SignalServiceAddress targetAuthor,
-                                         long targetSentTimestamp, byte[] groupId)
-            throws IOException, EncapsulatedExceptions, AttachmentInvalidException {
-        SignalServiceDataMessage.Reaction reaction = new SignalServiceDataMessage.Reaction(emoji, remove, targetAuthor, targetSentTimestamp);
+    public Pair<Long, List<SendMessageResult>> sendGroupMessage(
+            String messageText, List<String> attachments, GroupId groupId
+    ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException {

         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()

-                .withReaction(reaction)
-                .withProfileKey(account.getProfileKey().serialize());
-        if (groupId != null) {
-            SignalServiceGroup group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.DELIVER)
-                    .withId(groupId)
-                    .build();
-            messageBuilder.asGroupMessage(group);
+                .withBody(messageText);
+        if (attachments != null) {
+            messageBuilder.withAttachments(AttachmentUtils.getSignalServiceAttachments(attachments));

         }
         }

-        final GroupInfo g = getGroupForSending(groupId);
-        // Don't send group message to ourself
-        final List<String> membersSend = new ArrayList<>(g.members);
-        membersSend.remove(this.username);
-        sendMessageLegacy(messageBuilder, membersSend);
+
+        return sendGroupMessage(messageBuilder, groupId);

     }
 
     }
 

-    public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions {
-        SignalServiceGroup group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.QUIT)
-                .withId(groupId)
-                .build();
+    public Pair<Long, List<SendMessageResult>> sendGroupMessageReaction(
+            String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, GroupId groupId
+    ) throws IOException, InvalidNumberException, NotAGroupMemberException, GroupNotFoundException {
+        SignalServiceDataMessage.Reaction reaction = new SignalServiceDataMessage.Reaction(emoji,
+                remove,
+                canonicalizeAndResolveSignalServiceAddress(targetAuthor),
+                targetSentTimestamp);
+        final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
+                .withReaction(reaction);

 
 

-        SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
-                .asGroupMessage(group);
+        return sendGroupMessage(messageBuilder, groupId);
+    }

 
 

-        final GroupInfo g = getGroupForSending(groupId);
-        g.members.remove(this.username);
-        account.getGroupStore().updateGroup(g);
+    public Pair<Long, List<SendMessageResult>> sendQuitGroupMessage(GroupId groupId) throws GroupNotFoundException, IOException, NotAGroupMemberException {
+
+        SignalServiceDataMessage.Builder messageBuilder;
+
+        final GroupInfo g = getGroupForUpdating(groupId);
+        if (g instanceof GroupInfoV1) {
+            GroupInfoV1 groupInfoV1 = (GroupInfoV1) g;
+            SignalServiceGroup group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.QUIT)
+                    .withId(groupId.serialize())
+                    .build();
+            messageBuilder = SignalServiceDataMessage.newBuilder().asGroupMessage(group);
+            groupInfoV1.removeMember(account.getSelfAddress());
+            account.getGroupStore().updateGroup(groupInfoV1);
+        } else {
+            final GroupInfoV2 groupInfoV2 = (GroupInfoV2) g;
+            final Pair<DecryptedGroup, GroupChange> groupGroupChangePair = groupHelper.leaveGroup(groupInfoV2);
+            groupInfoV2.setGroup(groupGroupChangePair.first());
+            messageBuilder = getGroupUpdateMessageBuilder(groupInfoV2, groupGroupChangePair.second().toByteArray());
+            account.getGroupStore().updateGroup(groupInfoV2);
+        }

 
 

-        sendMessageLegacy(messageBuilder, g.members);
+        return sendMessage(messageBuilder, g.getMembersWithout(account.getSelfAddress()));

     }
 
     }
 

-    private byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection<String> members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
+    private Pair<GroupId, List<SendMessageResult>> sendUpdateGroupMessage(
+            GroupId groupId, String name, Collection<SignalServiceAddress> members, String avatarFile
+    ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException {

         GroupInfo g;
         GroupInfo g;

+        SignalServiceDataMessage.Builder messageBuilder;

         if (groupId == null) {
             // Create new group
         if (groupId == null) {
             // Create new group

-            g = new GroupInfo(KeyUtils.createGroupId());
-            g.members.add(username);
+            GroupInfoV2 gv2 = groupHelper.createGroupV2(name, members, avatarFile);
+            if (gv2 == null) {
+                GroupInfoV1 gv1 = new GroupInfoV1(GroupIdV1.createRandom());
+                gv1.addMembers(List.of(account.getSelfAddress()));
+                updateGroupV1(gv1, name, members, avatarFile);
+                messageBuilder = getGroupUpdateMessageBuilder(gv1);
+                g = gv1;
+            } else {
+                messageBuilder = getGroupUpdateMessageBuilder(gv2, null);
+                g = gv2;
+            }

         } else {
         } else {

-            g = getGroupForSending(groupId);
+            GroupInfo group = getGroupForUpdating(groupId);
+            if (group instanceof GroupInfoV2) {
+                final GroupInfoV2 groupInfoV2 = (GroupInfoV2) group;
+
+                Pair<Long, List<SendMessageResult>> result = null;
+                if (groupInfoV2.isPendingMember(getSelfAddress())) {
+                    Pair<DecryptedGroup, GroupChange> groupGroupChangePair = groupHelper.acceptInvite(groupInfoV2);
+                    result = sendUpdateGroupMessage(groupInfoV2,
+                            groupGroupChangePair.first(),
+                            groupGroupChangePair.second());
+                }
+
+                if (members != null) {
+                    final Set<SignalServiceAddress> newMembers = new HashSet<>(members);
+                    newMembers.removeAll(group.getMembers()
+                            .stream()
+                            .map(this::resolveSignalServiceAddress)
+                            .collect(Collectors.toSet()));
+                    if (newMembers.size() > 0) {
+                        Pair<DecryptedGroup, GroupChange> groupGroupChangePair = groupHelper.updateGroupV2(groupInfoV2,
+                                newMembers);
+                        result = sendUpdateGroupMessage(groupInfoV2,
+                                groupGroupChangePair.first(),
+                                groupGroupChangePair.second());
+                    }
+                }
+                if (result == null || name != null || avatarFile != null) {
+                    Pair<DecryptedGroup, GroupChange> groupGroupChangePair = groupHelper.updateGroupV2(groupInfoV2,
+                            name,
+                            avatarFile);
+                    result = sendUpdateGroupMessage(groupInfoV2,
+                            groupGroupChangePair.first(),
+                            groupGroupChangePair.second());
+                }
+
+                return new Pair<>(group.getGroupId(), result.second());
+            } else {
+                GroupInfoV1 gv1 = (GroupInfoV1) group;
+                updateGroupV1(gv1, name, members, avatarFile);
+                messageBuilder = getGroupUpdateMessageBuilder(gv1);
+                g = gv1;
+            }

         }
 
         }
 

+        account.getGroupStore().updateGroup(g);
+
+        final Pair<Long, List<SendMessageResult>> result = sendMessage(messageBuilder,
+                g.getMembersIncludingPendingWithout(account.getSelfAddress()));
+        return new Pair<>(g.getGroupId(), result.second());
+    }
+
+    public Pair<GroupId, List<SendMessageResult>> joinGroup(
+            GroupInviteLinkUrl inviteLinkUrl
+    ) throws IOException, GroupLinkNotActiveException {
+        return sendJoinGroupMessage(inviteLinkUrl);
+    }
+
+    private Pair<GroupId, List<SendMessageResult>> sendJoinGroupMessage(
+            GroupInviteLinkUrl inviteLinkUrl
+    ) throws IOException, GroupLinkNotActiveException {
+        final DecryptedGroupJoinInfo groupJoinInfo = groupHelper.getDecryptedGroupJoinInfo(inviteLinkUrl.getGroupMasterKey(),
+                inviteLinkUrl.getPassword());
+        final GroupChange groupChange = groupHelper.joinGroup(inviteLinkUrl.getGroupMasterKey(),
+                inviteLinkUrl.getPassword(),
+                groupJoinInfo);
+        final GroupInfoV2 group = getOrMigrateGroup(inviteLinkUrl.getGroupMasterKey(),
+                groupJoinInfo.getRevision() + 1,
+                groupChange.toByteArray());
+
+        if (group.getGroup() == null) {
+            // Only requested member, can't send update to group members
+            return new Pair<>(group.getGroupId(), List.of());
+        }
+
+        final Pair<Long, List<SendMessageResult>> result = sendUpdateGroupMessage(group, group.getGroup(), groupChange);
+
+        return new Pair<>(group.getGroupId(), result.second());
+    }
+
+    private Pair<Long, List<SendMessageResult>> sendUpdateGroupMessage(
+            GroupInfoV2 group, DecryptedGroup newDecryptedGroup, GroupChange groupChange
+    ) throws IOException {
+        group.setGroup(newDecryptedGroup);
+        final SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(group,
+                groupChange.toByteArray());
+        account.getGroupStore().updateGroup(group);
+        return sendMessage(messageBuilder, group.getMembersIncludingPendingWithout(account.getSelfAddress()));
+    }
+
+    private void updateGroupV1(
+            final GroupInfoV1 g,
+            final String name,
+            final Collection<SignalServiceAddress> members,
+            final String avatarFile
+    ) throws IOException {

         if (name != null) {
             g.name = name;
         }
 
         if (members != null) {
         if (name != null) {
             g.name = name;
         }
 
         if (members != null) {

-            Set<String> newMembers = new HashSet<>();
-            for (String member : members) {
-                try {
-                    member = Utils.canonicalizeNumber(member, username);
-                } catch (InvalidNumberException e) {
-                    System.err.println("Failed to add member \"" + member + "\" to group: " + e.getMessage());
-                    System.err.println("Aborting…");
-                    System.exit(1);
-                }
-                if (g.members.contains(member)) {
+            final Set<String> newE164Members = new HashSet<>();
+            for (SignalServiceAddress member : members) {
+                if (g.isMember(member) || !member.getNumber().isPresent()) {

                     continue;
                 }
                     continue;
                 }

-                newMembers.add(member);
-                g.members.add(member);
+                newE164Members.add(member.getNumber().get());

             }
             }

-            final List<ContactTokenDetails> contacts = accountManager.getContacts(newMembers);
-            if (contacts.size() != newMembers.size()) {
+
+            final List<ContactTokenDetails> contacts = accountManager.getContacts(newE164Members);
+            if (contacts.size() != newE164Members.size()) {

                 // Some of the new members are not registered on Signal
                 for (ContactTokenDetails contact : contacts) {
                 // Some of the new members are not registered on Signal
                 for (ContactTokenDetails contact : contacts) {

-                    newMembers.remove(contact.getNumber());
+                    newE164Members.remove(contact.getNumber());

                 }
                 }

-                System.err.println("Failed to add members " + Util.join(", ", newMembers) + " to group: Not registered on Signal");
-                System.err.println("Aborting…");
-                System.exit(1);
+                throw new IOException("Failed to add members "
+                        + String.join(", ", newE164Members)
+                        + " to group: Not registered on Signal");

             }
             }

+
+            g.addMembers(members);

         }
 
         if (avatarFile != null) {
         }
 
         if (avatarFile != null) {

-            IOUtils.createPrivateDirectories(avatarsPath);
-            File aFile = getGroupAvatarFile(g.groupId);
+            IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());
+            File aFile = getGroupAvatarFile(g.getGroupId());

             Files.copy(Paths.get(avatarFile), aFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
         }
             Files.copy(Paths.get(avatarFile), aFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
         }

-
-        account.getGroupStore().updateGroup(g);
-
-        SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(g);
-
-        // Don't send group message to ourself
-        final List<String> membersSend = new ArrayList<>(g.members);
-        membersSend.remove(this.username);
-        sendMessageLegacy(messageBuilder, membersSend);
-        return g.groupId;

     }
 
     }
 

-    private void sendUpdateGroupMessage(byte[] groupId, String recipient) throws IOException, EncapsulatedExceptions {
-        if (groupId == null) {
-            return;
+    Pair<Long, List<SendMessageResult>> sendUpdateGroupMessage(
+            GroupIdV1 groupId, SignalServiceAddress recipient
+    ) throws IOException, NotAGroupMemberException, GroupNotFoundException, AttachmentInvalidException {
+        GroupInfoV1 g;
+        GroupInfo group = getGroupForSending(groupId);
+        if (!(group instanceof GroupInfoV1)) {
+            throw new RuntimeException("Received an invalid group request for a v2 group!");

         }
         }

-        GroupInfo g = getGroupForSending(groupId);
+        g = (GroupInfoV1) group;

 
 

-        if (!g.members.contains(recipient)) {
-            return;
+        if (!g.isMember(recipient)) {
+            throw new NotAGroupMemberException(groupId, g.name);

         }
 
         SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(g);
 
         // Send group message only to the recipient who requested it
         }
 
         SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(g);
 
         // Send group message only to the recipient who requested it

-        final List<String> membersSend = new ArrayList<>();
-        membersSend.add(recipient);
-        sendMessageLegacy(messageBuilder, membersSend);
+        return sendMessage(messageBuilder, List.of(recipient));

     }
 
     }
 

-    private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfo g) {
+    private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfoV1 g) throws AttachmentInvalidException {

         SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
         SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)

-                .withId(g.groupId)
+                .withId(g.getGroupId().serialize())

                 .withName(g.name)
                 .withMembers(new ArrayList<>(g.getMembers()));
 
                 .withName(g.name)
                 .withMembers(new ArrayList<>(g.getMembers()));
 

-        File aFile = getGroupAvatarFile(g.groupId);
+        File aFile = getGroupAvatarFile(g.getGroupId());

         if (aFile.exists()) {
             try {
         if (aFile.exists()) {
             try {

-                group.withAvatar(Utils.createAttachment(aFile));
+                group.withAvatar(AttachmentUtils.createAttachment(aFile));

             } catch (IOException e) {
                 throw new AttachmentInvalidException(aFile.toString(), e);
             }
         }
 
             } catch (IOException e) {
                 throw new AttachmentInvalidException(aFile.toString(), e);
             }
         }
 

-        SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
-                .asGroupMessage(group.build());
-
-        ThreadInfo thread = account.getThreadStore().getThread(Base64.encodeBytes(g.groupId));
-        if (thread != null) {
-            messageBuilder.withExpiration(thread.messageExpirationTime);
-        }
-
-        return messageBuilder;
+        return SignalServiceDataMessage.newBuilder()
+                .asGroupMessage(group.build())
+                .withExpiration(g.getMessageExpirationTime());

     }
 
     }
 

-    private void sendGroupInfoRequest(byte[] groupId, String recipient) throws IOException, EncapsulatedExceptions {
-        if (groupId == null) {
-            return;
-        }
+    private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfoV2 g, byte[] signedGroupChange) {
+        SignalServiceGroupV2.Builder group = SignalServiceGroupV2.newBuilder(g.getMasterKey())
+                .withRevision(g.getGroup().getRevision())
+                .withSignedGroupChange(signedGroupChange);
+        return SignalServiceDataMessage.newBuilder()
+                .asGroupMessage(group.build())
+                .withExpiration(g.getMessageExpirationTime());
+    }

 
 

+    Pair<Long, List<SendMessageResult>> sendGroupInfoRequest(
+            GroupIdV1 groupId, SignalServiceAddress recipient
+    ) throws IOException {

         SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.REQUEST_INFO)
         SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.REQUEST_INFO)

-                .withId(groupId);
+                .withId(groupId.serialize());

 
         SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
                 .asGroupMessage(group.build());
 
 
         SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
                 .asGroupMessage(group.build());
 

-        ThreadInfo thread = account.getThreadStore().getThread(Base64.encodeBytes(groupId));
-        if (thread != null) {
-            messageBuilder.withExpiration(thread.messageExpirationTime);
-        }
-

         // Send group info request message to the recipient who sent us a message with this groupId
         // Send group info request message to the recipient who sent us a message with this groupId

-        final List<String> membersSend = new ArrayList<>();
-        membersSend.add(recipient);
-        sendMessageLegacy(messageBuilder, membersSend);
+        return sendMessage(messageBuilder, List.of(recipient));

     }
 
     }
 

-    @Override
-    public void sendMessage(String message, List<String> attachments, String recipient)
-            throws EncapsulatedExceptions, AttachmentInvalidException, IOException {
-        List<String> recipients = new ArrayList<>(1);
-        recipients.add(recipient);
-        sendMessage(message, attachments, recipients);
+    void sendReceipt(
+            SignalServiceAddress remoteAddress, long messageId
+    ) throws IOException, UntrustedIdentityException {
+        SignalServiceReceiptMessage receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.DELIVERY,
+                List.of(messageId),
+                System.currentTimeMillis());
+
+        createMessageSender().sendReceipt(remoteAddress,
+                unidentifiedAccessHelper.getAccessFor(remoteAddress),
+                receiptMessage);

     }
 
     }
 

-    @Override
-    public void sendMessage(String messageText, List<String> attachments,
-                            List<String> recipients)
-            throws IOException, EncapsulatedExceptions, AttachmentInvalidException {
-        final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
+    public Pair<Long, List<SendMessageResult>> sendMessage(
+            String messageText, List<String> attachments, List<String> recipients
+    ) throws IOException, AttachmentInvalidException, InvalidNumberException {
+        final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
+                .withBody(messageText);

         if (attachments != null) {
         if (attachments != null) {

-            List<SignalServiceAttachment> attachmentStreams = Utils.getSignalServiceAttachments(attachments);
+            List<SignalServiceAttachment> attachmentStreams = AttachmentUtils.getSignalServiceAttachments(attachments);

 
             // Upload attachments here, so we only upload once even for multiple recipients
 
             // Upload attachments here, so we only upload once even for multiple recipients

-            SignalServiceMessageSender messageSender = getMessageSender();
+            SignalServiceMessageSender messageSender = createMessageSender();

             List<SignalServiceAttachment> attachmentPointers = new ArrayList<>(attachmentStreams.size());
             for (SignalServiceAttachment attachment : attachmentStreams) {
                 if (attachment.isStream()) {
             List<SignalServiceAttachment> attachmentPointers = new ArrayList<>(attachmentStreams.size());
             for (SignalServiceAttachment attachment : attachmentStreams) {
                 if (attachment.isStream()) {


@@ -720,32 +1126,38 @@ public class Manager implements Signal {
 
             messageBuilder.withAttachments(attachmentPointers);
         }
 
             messageBuilder.withAttachments(attachmentPointers);
         }

-        messageBuilder.withProfileKey(account.getProfileKey().serialize());
-        sendMessageLegacy(messageBuilder, recipients);
+        return sendMessage(messageBuilder, getSignalServiceAddresses(recipients));

     }
 
     }
 

-    public void sendMessageReaction(String emoji, boolean remove, SignalServiceAddress targetAuthor,
-                                    long targetSentTimestamp, List<String> recipients)
-            throws IOException, EncapsulatedExceptions, AttachmentInvalidException {
-        SignalServiceDataMessage.Reaction reaction = new SignalServiceDataMessage.Reaction(emoji, remove, targetAuthor, targetSentTimestamp);
+    public Pair<Long, List<SendMessageResult>> sendMessageReaction(
+            String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, List<String> recipients
+    ) throws IOException, InvalidNumberException {
+        SignalServiceDataMessage.Reaction reaction = new SignalServiceDataMessage.Reaction(emoji,
+                remove,
+                canonicalizeAndResolveSignalServiceAddress(targetAuthor),
+                targetSentTimestamp);

         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()

-                .withReaction(reaction)
-                .withProfileKey(account.getProfileKey().serialize());
-        sendMessageLegacy(messageBuilder, recipients);
+                .withReaction(reaction);
+        return sendMessage(messageBuilder, getSignalServiceAddresses(recipients));

     }
 
     }
 

-    @Override
-    public void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions {
-        SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
-                .asEndSessionMessage();
+    public Pair<Long, List<SendMessageResult>> sendEndSessionMessage(List<String> recipients) throws IOException, InvalidNumberException {
+        SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder().asEndSessionMessage();

 
 

-        sendMessageLegacy(messageBuilder, recipients);
+        final Collection<SignalServiceAddress> signalServiceAddresses = getSignalServiceAddresses(recipients);
+        try {
+            return sendMessage(messageBuilder, signalServiceAddresses);
+        } catch (Exception e) {
+            for (SignalServiceAddress address : signalServiceAddresses) {
+                handleEndSession(address);
+            }
+            account.save();
+            throw e;
+        }

     }
 
     }
 

-    @Override

     public String getContactName(String number) throws InvalidNumberException {
     public String getContactName(String number) throws InvalidNumberException {

-        String canonicalizedNumber = Utils.canonicalizeNumber(number, username);
-        ContactInfo contact = account.getContactStore().getContact(canonicalizedNumber);
+        ContactInfo contact = account.getContactStore().getContact(canonicalizeAndResolveSignalServiceAddress(number));

         if (contact == null) {
             return "";
         } else {
         if (contact == null) {
             return "";
         } else {


@@ -753,112 +1165,216 @@ public class Manager implements Signal {
         }
     }
 
         }
     }
 

-    @Override

     public void setContactName(String number, String name) throws InvalidNumberException {
     public void setContactName(String number, String name) throws InvalidNumberException {

-        String canonicalizedNumber = Utils.canonicalizeNumber(number, username);
-        ContactInfo contact = account.getContactStore().getContact(canonicalizedNumber);
+        final SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(number);
+        ContactInfo contact = account.getContactStore().getContact(address);

         if (contact == null) {
         if (contact == null) {

-            contact = new ContactInfo();
-            contact.number = canonicalizedNumber;
-            System.err.println("Add contact " + canonicalizedNumber + " named " + name);
-        } else {
-            System.err.println("Updating contact " + canonicalizedNumber + " name " + contact.name + " -> " + name);
+            contact = new ContactInfo(address);

         }
         contact.name = name;
         account.getContactStore().updateContact(contact);
         account.save();
     }
 
         }
         contact.name = name;
         account.getContactStore().updateContact(contact);
         account.save();
     }
 

-    @Override

     public void setContactBlocked(String number, boolean blocked) throws InvalidNumberException {
     public void setContactBlocked(String number, boolean blocked) throws InvalidNumberException {

-        number = Utils.canonicalizeNumber(number, username);
-        ContactInfo contact = account.getContactStore().getContact(number);
+        setContactBlocked(canonicalizeAndResolveSignalServiceAddress(number), blocked);
+    }
+
+    private void setContactBlocked(SignalServiceAddress address, boolean blocked) {
+        ContactInfo contact = account.getContactStore().getContact(address);

         if (contact == null) {
         if (contact == null) {

-            contact = new ContactInfo();
-            contact.number = number;
-            System.err.println("Adding and " + (blocked ? "blocking" : "unblocking") + " contact " + number);
-        } else {
-            System.err.println((blocked ? "Blocking" : "Unblocking") + " contact " + number);
+            contact = new ContactInfo(address);

         }
         contact.blocked = blocked;
         account.getContactStore().updateContact(contact);
         account.save();
     }
 
         }
         contact.blocked = blocked;
         account.getContactStore().updateContact(contact);
         account.save();
     }
 

-    @Override
-    public void setGroupBlocked(final byte[] groupId, final boolean blocked) throws GroupNotFoundException {
+    public void setGroupBlocked(final GroupId groupId, final boolean blocked) throws GroupNotFoundException {

         GroupInfo group = getGroup(groupId);
         if (group == null) {
             throw new GroupNotFoundException(groupId);
         GroupInfo group = getGroup(groupId);
         if (group == null) {
             throw new GroupNotFoundException(groupId);

-        } else {
-            System.err.println((blocked ? "Blocking" : "Unblocking") + " group " + Base64.encodeBytes(groupId));
-            group.blocked = blocked;
-            account.getGroupStore().updateGroup(group);
-            account.save();

         }
         }

+
+        group.setBlocked(blocked);
+        account.getGroupStore().updateGroup(group);
+        account.save();

     }
 
     }
 

-    @Override
-    public List<byte[]> getGroupIds() {
-        List<GroupInfo> groups = getGroups();
-        List<byte[]> ids = new ArrayList<>(groups.size());
-        for (GroupInfo group : groups) {
-            ids.add(group.groupId);
-        }
-        return ids;
+    public Pair<GroupId, List<SendMessageResult>> updateGroup(
+            GroupId groupId, String name, List<String> members, String avatar
+    ) throws IOException, GroupNotFoundException, AttachmentInvalidException, InvalidNumberException, NotAGroupMemberException {
+        return sendUpdateGroupMessage(groupId,
+                name,
+                members == null ? null : getSignalServiceAddresses(members),
+                avatar);

     }
 
     }
 

-    @Override
-    public String getGroupName(byte[] groupId) {
-        GroupInfo group = getGroup(groupId);
-        if (group == null) {
-            return "";
+    /**
+     * Change the expiration timer for a contact
+     */
+    public void setExpirationTimer(SignalServiceAddress address, int messageExpirationTimer) throws IOException {
+        ContactInfo contact = account.getContactStore().getContact(address);
+        contact.messageExpirationTime = messageExpirationTimer;
+        account.getContactStore().updateContact(contact);
+        sendExpirationTimerUpdate(address);
+        account.save();
+    }
+
+    private void sendExpirationTimerUpdate(SignalServiceAddress address) throws IOException {
+        final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
+                .asExpirationUpdate();
+        sendMessage(messageBuilder, List.of(address));
+    }
+
+    /**
+     * Change the expiration timer for a contact
+     */
+    public void setExpirationTimer(
+            String number, int messageExpirationTimer
+    ) throws IOException, InvalidNumberException {
+        SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(number);
+        setExpirationTimer(address, messageExpirationTimer);
+    }
+
+    /**
+     * Change the expiration timer for a group
+     */
+    public void setExpirationTimer(GroupId groupId, int messageExpirationTimer) {
+        GroupInfo g = account.getGroupStore().getGroup(groupId);
+        if (g instanceof GroupInfoV1) {
+            GroupInfoV1 groupInfoV1 = (GroupInfoV1) g;
+            groupInfoV1.messageExpirationTime = messageExpirationTimer;
+            account.getGroupStore().updateGroup(groupInfoV1);

         } else {
         } else {

-            return group.name;
+            throw new RuntimeException("TODO Not implemented!");

         }
     }
 
         }
     }
 

-    @Override
-    public List<String> getGroupMembers(byte[] groupId) {
-        GroupInfo group = getGroup(groupId);
-        if (group == null) {
-            return new ArrayList<>();
-        } else {
-            return new ArrayList<>(group.members);
+    /**
+     * Upload the sticker pack from path.
+     *
+     * @param path Path can be a path to a manifest.json file or to a zip file that contains a manifest.json file
+     * @return if successful, returns the URL to install the sticker pack in the signal app
+     */
+    public String uploadStickerPack(File path) throws IOException, StickerPackInvalidException {
+        SignalServiceStickerManifestUpload manifest = getSignalServiceStickerManifestUpload(path);
+
+        SignalServiceMessageSender messageSender = createMessageSender();
+
+        byte[] packKey = KeyUtils.createStickerUploadKey();
+        String packId = messageSender.uploadStickerManifest(manifest, packKey);
+
+        Sticker sticker = new Sticker(Hex.fromStringCondensed(packId), packKey);
+        account.getStickerStore().updateSticker(sticker);
+        account.save();
+
+        try {
+            return new URI("https",
+                    "signal.art",
+                    "/addstickers/",
+                    "pack_id=" + URLEncoder.encode(packId, StandardCharsets.UTF_8) + "&pack_key=" + URLEncoder.encode(
+                            Hex.toStringCondensed(packKey),
+                            StandardCharsets.UTF_8)).toString();
+        } catch (URISyntaxException e) {
+            throw new AssertionError(e);

         }
     }
 
         }
     }
 

-    @Override
-    public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
-        if (groupId.length == 0) {
-            groupId = null;
+    private SignalServiceStickerManifestUpload getSignalServiceStickerManifestUpload(
+            final File file
+    ) throws IOException, StickerPackInvalidException {
+        ZipFile zip = null;
+        String rootPath = null;
+
+        if (file.getName().endsWith(".zip")) {
+            zip = new ZipFile(file);
+        } else if (file.getName().equals("manifest.json")) {
+            rootPath = file.getParent();
+        } else {
+            throw new StickerPackInvalidException("Could not find manifest.json");

         }
         }

-        if (name.isEmpty()) {
-            name = null;
+
+        JsonStickerPack pack = parseStickerPack(rootPath, zip);
+
+        if (pack.stickers == null) {
+            throw new StickerPackInvalidException("Must set a 'stickers' field.");

         }
         }

-        if (members.size() == 0) {
-            members = null;
+
+        if (pack.stickers.isEmpty()) {
+            throw new StickerPackInvalidException("Must include stickers.");

         }
         }

-        if (avatar.isEmpty()) {
-            avatar = null;
+
+        List<StickerInfo> stickers = new ArrayList<>(pack.stickers.size());
+        for (JsonStickerPack.JsonSticker sticker : pack.stickers) {
+            if (sticker.file == null) {
+                throw new StickerPackInvalidException("Must set a 'file' field on each sticker.");
+            }
+
+            Pair<InputStream, Long> data;
+            try {
+                data = getInputStreamAndLength(rootPath, zip, sticker.file);
+            } catch (IOException ignored) {
+                throw new StickerPackInvalidException("Could not find find " + sticker.file);
+            }
+
+            String contentType = Utils.getFileMimeType(new File(sticker.file), null);
+            StickerInfo stickerInfo = new StickerInfo(data.first(),
+                    data.second(),
+                    Optional.fromNullable(sticker.emoji).or(""),
+                    contentType);
+            stickers.add(stickerInfo);
+        }
+
+        StickerInfo cover = null;
+        if (pack.cover != null) {
+            if (pack.cover.file == null) {
+                throw new StickerPackInvalidException("Must set a 'file' field on the cover.");
+            }
+
+            Pair<InputStream, Long> data;
+            try {
+                data = getInputStreamAndLength(rootPath, zip, pack.cover.file);
+            } catch (IOException ignored) {
+                throw new StickerPackInvalidException("Could not find find " + pack.cover.file);
+            }
+
+            String contentType = Utils.getFileMimeType(new File(pack.cover.file), null);
+            cover = new StickerInfo(data.first(),
+                    data.second(),
+                    Optional.fromNullable(pack.cover.emoji).or(""),
+                    contentType);

         }
         }

-        return sendUpdateGroupMessage(groupId, name, members, avatar);
+
+        return new SignalServiceStickerManifestUpload(pack.title, pack.author, cover, stickers);

     }
 
     }
 

-    /**
-     * Change the expiration timer for a thread (number of groupId)
-     *
-     * @param numberOrGroupId
-     * @param messageExpirationTimer
-     */
-    public void setExpirationTimer(String numberOrGroupId, int messageExpirationTimer) {
-        ThreadInfo thread = account.getThreadStore().getThread(numberOrGroupId);
-        thread.messageExpirationTime = messageExpirationTimer;
-        account.getThreadStore().updateThread(thread);
+    private static JsonStickerPack parseStickerPack(String rootPath, ZipFile zip) throws IOException {
+        InputStream inputStream;
+        if (zip != null) {
+            inputStream = zip.getInputStream(zip.getEntry("manifest.json"));
+        } else {
+            inputStream = new FileInputStream((new File(rootPath, "manifest.json")));
+        }
+        return new ObjectMapper().readValue(inputStream, JsonStickerPack.class);

     }
 
     }
 

-    private void requestSyncGroups() throws IOException {
-        SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder().setType(SignalServiceProtos.SyncMessage.Request.Type.GROUPS).build();
+    private static Pair<InputStream, Long> getInputStreamAndLength(
+            final String rootPath, final ZipFile zip, final String subfile
+    ) throws IOException {
+        if (zip != null) {
+            final ZipEntry entry = zip.getEntry(subfile);
+            return new Pair<>(zip.getInputStream(entry), entry.getSize());
+        } else {
+            final File file = new File(rootPath, subfile);
+            return new Pair<>(new FileInputStream(file), file.length());
+        }
+    }
+
+    void requestSyncGroups() throws IOException {
+        SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder()
+                .setType(SignalServiceProtos.SyncMessage.Request.Type.GROUPS)
+                .build();

         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendSyncMessage(message);
         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendSyncMessage(message);


@@ -867,8 +1383,10 @@ public class Manager implements Signal {
         }
     }
 
         }
     }
 

-    private void requestSyncContacts() throws IOException {
-        SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder().setType(SignalServiceProtos.SyncMessage.Request.Type.CONTACTS).build();
+    void requestSyncContacts() throws IOException {
+        SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder()
+                .setType(SignalServiceProtos.SyncMessage.Request.Type.CONTACTS)
+                .build();

         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendSyncMessage(message);
         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendSyncMessage(message);


@@ -877,8 +1395,10 @@ public class Manager implements Signal {
         }
     }
 
         }
     }
 

-    private void requestSyncBlocked() throws IOException {
-        SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder().setType(SignalServiceProtos.SyncMessage.Request.Type.BLOCKED).build();
+    void requestSyncBlocked() throws IOException {
+        SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder()
+                .setType(SignalServiceProtos.SyncMessage.Request.Type.BLOCKED)
+                .build();

         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendSyncMessage(message);
         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendSyncMessage(message);


@@ -887,8 +1407,10 @@ public class Manager implements Signal {
         }
     }
 
         }
     }
 

-    private void requestSyncConfiguration() throws IOException {
-        SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder().setType(SignalServiceProtos.SyncMessage.Request.Type.CONFIGURATION).build();
+    void requestSyncConfiguration() throws IOException {
+        SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder()
+                .setType(SignalServiceProtos.SyncMessage.Request.Type.CONFIGURATION)
+                .build();

         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendSyncMessage(message);
         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendSyncMessage(message);


@@ -897,319 +1419,337 @@ public class Manager implements Signal {
         }
     }
 
         }
     }
 

-    private byte[] getSenderCertificate() throws IOException {
-        byte[] certificate = accountManager.getSenderCertificate();
-        // TODO cache for a day
-        return certificate;
-    }
-
-    private byte[] getSelfUnidentifiedAccessKey() {
-        return UnidentifiedAccess.deriveAccessKeyFrom(account.getProfileKey());
-    }
-
-    private static SignalProfile decryptProfile(SignalServiceProfile encryptedProfile, ProfileKey profileKey) throws IOException {
-        ProfileCipher profileCipher = new ProfileCipher(profileKey);
+    private byte[] getSenderCertificate() {
+        // TODO support UUID capable sender certificates
+        // byte[] certificate = accountManager.getSenderCertificateForPhoneNumberPrivacy();
+        byte[] certificate;

         try {
         try {

-            return new SignalProfile(
-                    encryptedProfile.getIdentityKey(),
-                    encryptedProfile.getName() == null ? null : new String(profileCipher.decryptName(Base64.decode(encryptedProfile.getName()))),
-                    encryptedProfile.getAvatar(),
-                    encryptedProfile.getUnidentifiedAccess() == null || !profileCipher.verifyUnidentifiedAccess(Base64.decode(encryptedProfile.getUnidentifiedAccess())) ? null : encryptedProfile.getUnidentifiedAccess(),
-                    encryptedProfile.isUnrestrictedUnidentifiedAccess()
-            );
-        } catch (InvalidCiphertextException e) {
+            certificate = accountManager.getSenderCertificate();
+        } catch (IOException e) {
+            logger.warn("Failed to get sender certificate, ignoring: {}", e.getMessage());

             return null;
         }
             return null;
         }

+        // TODO cache for a day
+        return certificate;

     }
 
     }
 

-    private byte[] getTargetUnidentifiedAccessKey(SignalServiceAddress recipient) throws IOException {
-        ContactInfo contact = account.getContactStore().getContact(recipient.getNumber().get());
-        if (contact == null || contact.profileKey == null) {
-            return null;
-        }
-        ProfileKey theirProfileKey;
-        try {
-            theirProfileKey = new ProfileKey(Base64.decode(contact.profileKey));
-        } catch (InvalidInputException e) {
-            throw new AssertionError(e);
-        }
-        SignalProfile targetProfile = decryptProfile(getRecipientProfile(recipient, Optional.absent()), theirProfileKey);
-
-        if (targetProfile == null || targetProfile.getUnidentifiedAccess() == null) {
-            return null;
-        }
-
-        if (targetProfile.isUnrestrictedUnidentifiedAccess()) {
-            return KeyUtils.createUnrestrictedUnidentifiedAccess();
-        }
-
-        return UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey);
-    }
-
-    private Optional<UnidentifiedAccessPair> getAccessForSync() throws IOException {
-        byte[] selfUnidentifiedAccessKey = getSelfUnidentifiedAccessKey();
-        byte[] selfUnidentifiedAccessCertificate = getSenderCertificate();
-
-        if (selfUnidentifiedAccessKey == null || selfUnidentifiedAccessCertificate == null) {
-            return Optional.absent();
-        }
-
-        try {
-            return Optional.of(new UnidentifiedAccessPair(
-                    new UnidentifiedAccess(selfUnidentifiedAccessKey, selfUnidentifiedAccessCertificate),
-                    new UnidentifiedAccess(selfUnidentifiedAccessKey, selfUnidentifiedAccessCertificate)
-            ));
-        } catch (InvalidCertificateException e) {
-            return Optional.absent();
-        }
-    }
-
-    private List<Optional<UnidentifiedAccessPair>> getAccessFor(Collection<SignalServiceAddress> recipients) throws IOException {
-        List<Optional<UnidentifiedAccessPair>> result = new ArrayList<>(recipients.size());
-        for (SignalServiceAddress recipient : recipients) {
-            result.add(getAccessFor(recipient));
-        }
-        return result;
-    }
-
-    private Optional<UnidentifiedAccessPair> getAccessFor(SignalServiceAddress recipient) throws IOException {
-        byte[] recipientUnidentifiedAccessKey = getTargetUnidentifiedAccessKey(recipient);
-        byte[] selfUnidentifiedAccessKey = getSelfUnidentifiedAccessKey();
-        byte[] selfUnidentifiedAccessCertificate = getSenderCertificate();
-
-        if (recipientUnidentifiedAccessKey == null || selfUnidentifiedAccessKey == null || selfUnidentifiedAccessCertificate == null) {
-            return Optional.absent();
-        }
-
-        try {
-            return Optional.of(new UnidentifiedAccessPair(
-                    new UnidentifiedAccess(recipientUnidentifiedAccessKey, selfUnidentifiedAccessCertificate),
-                    new UnidentifiedAccess(selfUnidentifiedAccessKey, selfUnidentifiedAccessCertificate)
-            ));
-        } catch (InvalidCertificateException e) {
-            return Optional.absent();
-        }
-    }
-
-    private void sendSyncMessage(SignalServiceSyncMessage message)
-            throws IOException, UntrustedIdentityException {
-        SignalServiceMessageSender messageSender = getMessageSender();
+    private void sendSyncMessage(SignalServiceSyncMessage message) throws IOException, UntrustedIdentityException {
+        SignalServiceMessageSender messageSender = createMessageSender();

         try {
         try {

-            messageSender.sendMessage(message, getAccessForSync());
+            messageSender.sendMessage(message, unidentifiedAccessHelper.getAccessForSync());

         } catch (UntrustedIdentityException e) {
         } catch (UntrustedIdentityException e) {

-            account.getSignalProtocolStore().saveIdentity(e.getIdentifier(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
+            account.getSignalProtocolStore()
+                    .saveIdentity(resolveSignalServiceAddress(e.getIdentifier()),
+                            e.getIdentityKey(),
+                            TrustLevel.UNTRUSTED);

             throw e;
         }
     }
 
             throw e;
         }
     }
 

-    /**
-     * This method throws an EncapsulatedExceptions exception instead of returning a list of SendMessageResult.
-     */
-    private void sendMessageLegacy(SignalServiceDataMessage.Builder messageBuilder, Collection<String> recipients)
-            throws EncapsulatedExceptions, IOException {
-        List<SendMessageResult> results = sendMessage(messageBuilder, recipients);
-
-        List<UntrustedIdentityException> untrustedIdentities = new LinkedList<>();
-        List<UnregisteredUserException> unregisteredUsers = new LinkedList<>();
-        List<NetworkFailureException> networkExceptions = new LinkedList<>();
+    private Collection<SignalServiceAddress> getSignalServiceAddresses(Collection<String> numbers) throws InvalidNumberException {
+        final Set<SignalServiceAddress> signalServiceAddresses = new HashSet<>(numbers.size());
+        final Set<SignalServiceAddress> missingUuids = new HashSet<>();

 
 

-        for (SendMessageResult result : results) {
-            if (result.isUnregisteredFailure()) {
-                unregisteredUsers.add(new UnregisteredUserException(result.getAddress().getNumber().get(), null));
-            } else if (result.isNetworkFailure()) {
-                networkExceptions.add(new NetworkFailureException(result.getAddress().getNumber().get(), null));
-            } else if (result.getIdentityFailure() != null) {
-                untrustedIdentities.add(new UntrustedIdentityException("Untrusted", result.getAddress().getNumber().get(), result.getIdentityFailure().getIdentityKey()));
+        for (String number : numbers) {
+            final SignalServiceAddress resolvedAddress = canonicalizeAndResolveSignalServiceAddress(number);
+            if (resolvedAddress.getUuid().isPresent()) {
+                signalServiceAddresses.add(resolvedAddress);
+            } else {
+                missingUuids.add(resolvedAddress);

             }
         }
             }
         }

-        if (!untrustedIdentities.isEmpty() || !unregisteredUsers.isEmpty() || !networkExceptions.isEmpty()) {
-            throw new EncapsulatedExceptions(untrustedIdentities, unregisteredUsers, networkExceptions);
-        }
-    }

 
 

-    private List<SendMessageResult> sendMessage(SignalServiceDataMessage.Builder messageBuilder, Collection<String> recipients)
-            throws IOException {
-        Set<SignalServiceAddress> recipientsTS = Utils.getSignalServiceAddresses(recipients, username);
-        if (recipientsTS == null) {
-            account.save();
-            return Collections.emptyList();
+        Map<String, UUID> registeredUsers;
+        try {
+            registeredUsers = accountManager.getRegisteredUsers(getIasKeyStore(),
+                    missingUuids.stream().map(a -> a.getNumber().get()).collect(Collectors.toSet()),
+                    CDS_MRENCLAVE);
+        } catch (IOException | Quote.InvalidQuoteFormatException | UnauthenticatedQuoteException | SignatureException | UnauthenticatedResponseException e) {
+            logger.warn("Failed to resolve uuids from server, ignoring: {}", e.getMessage());
+            registeredUsers = new HashMap<>();
+        }
+
+        for (SignalServiceAddress address : missingUuids) {
+            final String number = address.getNumber().get();
+            if (registeredUsers.containsKey(number)) {
+                final SignalServiceAddress newAddress = resolveSignalServiceAddress(new SignalServiceAddress(
+                        registeredUsers.get(number),
+                        number));
+                signalServiceAddresses.add(newAddress);
+            } else {
+                signalServiceAddresses.add(address);
+            }

         }
 
         }
 

-        if (messagePipe == null) {
-            messagePipe = getMessageReceiver().createMessagePipe();
-        }
-        if (unidentifiedMessagePipe == null) {
-            unidentifiedMessagePipe = getMessageReceiver().createUnidentifiedMessagePipe();
-        }
+        return signalServiceAddresses;
+    }
+
+    private Pair<Long, List<SendMessageResult>> sendMessage(
+            SignalServiceDataMessage.Builder messageBuilder, Collection<SignalServiceAddress> recipients
+    ) throws IOException {
+        recipients = recipients.stream().map(this::resolveSignalServiceAddress).collect(Collectors.toSet());
+        final long timestamp = System.currentTimeMillis();
+        messageBuilder.withTimestamp(timestamp);
+        getOrCreateMessagePipe();
+        getOrCreateUnidentifiedMessagePipe();

         SignalServiceDataMessage message = null;
         try {
         SignalServiceDataMessage message = null;
         try {

-            SignalServiceMessageSender messageSender = getMessageSender();
-

             message = messageBuilder.build();
             message = messageBuilder.build();

-            if (message.getGroupInfo().isPresent()) {
+            if (message.getGroupContext().isPresent()) {

                 try {
                 try {

+                    SignalServiceMessageSender messageSender = createMessageSender();

                     final boolean isRecipientUpdate = false;
                     final boolean isRecipientUpdate = false;

-                    List<SendMessageResult> result = messageSender.sendMessage(new ArrayList<>(recipientsTS), getAccessFor(recipientsTS), isRecipientUpdate, message);
+                    List<SendMessageResult> result = messageSender.sendMessage(new ArrayList<>(recipients),
+                            unidentifiedAccessHelper.getAccessFor(recipients),
+                            isRecipientUpdate,
+                            message);

                     for (SendMessageResult r : result) {
                         if (r.getIdentityFailure() != null) {
                     for (SendMessageResult r : result) {
                         if (r.getIdentityFailure() != null) {

-                            account.getSignalProtocolStore().saveIdentity(r.getAddress().getNumber().get(), r.getIdentityFailure().getIdentityKey(), TrustLevel.UNTRUSTED);
-                        }
-                    }
-                    return result;
-                } catch (UntrustedIdentityException e) {
-                    account.getSignalProtocolStore().saveIdentity(e.getIdentifier(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
-                    return Collections.emptyList();
-                }
-            } else if (recipientsTS.size() == 1 && recipientsTS.contains(getSelfAddress())) {
-                SignalServiceAddress recipient = getSelfAddress();
-                final Optional<UnidentifiedAccessPair> unidentifiedAccess = getAccessFor(recipient);
-                SentTranscriptMessage transcript = new SentTranscriptMessage(Optional.of(recipient),
-                        message.getTimestamp(),
-                        message,
-                        message.getExpiresInSeconds(),
-                        Collections.singletonMap(recipient, unidentifiedAccess.isPresent()),
-                        false);
-                SignalServiceSyncMessage syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
-
-                List<SendMessageResult> results = new ArrayList<>(recipientsTS.size());
-                try {
-                    messageSender.sendMessage(syncMessage, unidentifiedAccess);
+                            account.getSignalProtocolStore()
+                                    .saveIdentity(r.getAddress(),
+                                            r.getIdentityFailure().getIdentityKey(),
+                                            TrustLevel.UNTRUSTED);
+                        }
+                    }
+                    return new Pair<>(timestamp, result);

                 } catch (UntrustedIdentityException e) {
                 } catch (UntrustedIdentityException e) {

-                    account.getSignalProtocolStore().saveIdentity(e.getIdentifier(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
-                    results.add(SendMessageResult.identityFailure(recipient, e.getIdentityKey()));
+                    account.getSignalProtocolStore()
+                            .saveIdentity(resolveSignalServiceAddress(e.getIdentifier()),
+                                    e.getIdentityKey(),
+                                    TrustLevel.UNTRUSTED);
+                    return new Pair<>(timestamp, List.of());

                 }
                 }

-                return results;

             } else {
                 // Send to all individually, so sync messages are sent correctly
             } else {
                 // Send to all individually, so sync messages are sent correctly

-                List<SendMessageResult> results = new ArrayList<>(recipientsTS.size());
-                for (SignalServiceAddress address : recipientsTS) {
-                    ThreadInfo thread = account.getThreadStore().getThread(address.getNumber().get());
-                    if (thread != null) {
-                        messageBuilder.withExpiration(thread.messageExpirationTime);
+                List<SendMessageResult> results = new ArrayList<>(recipients.size());
+                for (SignalServiceAddress address : recipients) {
+                    ContactInfo contact = account.getContactStore().getContact(address);
+                    if (contact != null) {
+                        messageBuilder.withExpiration(contact.messageExpirationTime);
+                        messageBuilder.withProfileKey(account.getProfileKey().serialize());

                     } else {
                         messageBuilder.withExpiration(0);
                     } else {
                         messageBuilder.withExpiration(0);

+                        messageBuilder.withProfileKey(null);

                     }
                     message = messageBuilder.build();
                     }
                     message = messageBuilder.build();

-                    try {
-                        SendMessageResult result = messageSender.sendMessage(address, getAccessFor(address), message);
-                        results.add(result);
-                    } catch (UntrustedIdentityException e) {
-                        account.getSignalProtocolStore().saveIdentity(e.getIdentifier(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
-                        results.add(SendMessageResult.identityFailure(address, e.getIdentityKey()));
+                    if (address.matches(account.getSelfAddress())) {
+                        results.add(sendSelfMessage(message));
+                    } else {
+                        results.add(sendMessage(address, message));

                     }
                 }
                     }
                 }

-                return results;
+                return new Pair<>(timestamp, results);

             }
         } finally {
             if (message != null && message.isEndSession()) {
             }
         } finally {
             if (message != null && message.isEndSession()) {

-                for (SignalServiceAddress recipient : recipientsTS) {
-                    handleEndSession(recipient.getNumber().get());
+                for (SignalServiceAddress recipient : recipients) {
+                    handleEndSession(recipient);

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

-    private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws InvalidMetadataMessageException, ProtocolInvalidMessageException, ProtocolDuplicateMessageException, ProtocolLegacyMessageException, ProtocolInvalidKeyIdException, InvalidMetadataVersionException, ProtocolInvalidVersionException, ProtocolNoSessionException, ProtocolInvalidKeyException, ProtocolUntrustedIdentityException, SelfSendException, UnsupportedDataMessageException {
-        SignalServiceCipher cipher = new SignalServiceCipher(getSelfAddress(), account.getSignalProtocolStore(), Utils.getCertificateValidator());
+    private SendMessageResult sendSelfMessage(SignalServiceDataMessage message) throws IOException {
+        SignalServiceMessageSender messageSender = createMessageSender();
+
+        SignalServiceAddress recipient = account.getSelfAddress();
+
+        final Optional<UnidentifiedAccessPair> unidentifiedAccess = unidentifiedAccessHelper.getAccessFor(recipient);
+        SentTranscriptMessage transcript = new SentTranscriptMessage(Optional.of(recipient),
+                message.getTimestamp(),
+                message,
+                message.getExpiresInSeconds(),
+                Map.of(recipient, unidentifiedAccess.isPresent()),
+                false);
+        SignalServiceSyncMessage syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
+
+        try {
+            long startTime = System.currentTimeMillis();
+            messageSender.sendMessage(syncMessage, unidentifiedAccess);
+            return SendMessageResult.success(recipient,
+                    unidentifiedAccess.isPresent(),
+                    false,
+                    System.currentTimeMillis() - startTime);
+        } catch (UntrustedIdentityException e) {
+            account.getSignalProtocolStore()
+                    .saveIdentity(resolveSignalServiceAddress(e.getIdentifier()),
+                            e.getIdentityKey(),
+                            TrustLevel.UNTRUSTED);
+            return SendMessageResult.identityFailure(recipient, e.getIdentityKey());
+        }
+    }
+
+    private SendMessageResult sendMessage(
+            SignalServiceAddress address, SignalServiceDataMessage message
+    ) throws IOException {
+        SignalServiceMessageSender messageSender = createMessageSender();
+
+        try {
+            return messageSender.sendMessage(address, unidentifiedAccessHelper.getAccessFor(address), message);
+        } catch (UntrustedIdentityException e) {
+            account.getSignalProtocolStore()
+                    .saveIdentity(resolveSignalServiceAddress(e.getIdentifier()),
+                            e.getIdentityKey(),
+                            TrustLevel.UNTRUSTED);
+            return SendMessageResult.identityFailure(address, e.getIdentityKey());
+        }
+    }
+
+    private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws InvalidMetadataMessageException, ProtocolInvalidMessageException, ProtocolDuplicateMessageException, ProtocolLegacyMessageException, ProtocolInvalidKeyIdException, InvalidMetadataVersionException, ProtocolInvalidVersionException, ProtocolNoSessionException, ProtocolInvalidKeyException, SelfSendException, UnsupportedDataMessageException, org.whispersystems.libsignal.UntrustedIdentityException {
+        SignalServiceCipher cipher = new SignalServiceCipher(account.getSelfAddress(),
+                account.getSignalProtocolStore(),
+                certificateValidator);

         try {
             return cipher.decrypt(envelope);
         } catch (ProtocolUntrustedIdentityException e) {
         try {
             return cipher.decrypt(envelope);
         } catch (ProtocolUntrustedIdentityException e) {

-            // TODO We don't get the new untrusted identity from ProtocolUntrustedIdentityException anymore ... we need to get it from somewhere else
-//            account.getSignalProtocolStore().saveIdentity(e.getSender(), e.getUntrustedIdentity(), TrustLevel.UNTRUSTED);
-            throw e;
+            if (e.getCause() instanceof org.whispersystems.libsignal.UntrustedIdentityException) {
+                org.whispersystems.libsignal.UntrustedIdentityException identityException = (org.whispersystems.libsignal.UntrustedIdentityException) e
+                        .getCause();
+                account.getSignalProtocolStore()
+                        .saveIdentity(resolveSignalServiceAddress(identityException.getName()),
+                                identityException.getUntrustedIdentity(),
+                                TrustLevel.UNTRUSTED);
+                throw identityException;
+            }
+            throw new AssertionError(e);

         }
     }
 
         }
     }
 

-    private void handleEndSession(String source) {
+    private void handleEndSession(SignalServiceAddress source) {

         account.getSignalProtocolStore().deleteAllSessions(source);
     }
 
         account.getSignalProtocolStore().deleteAllSessions(source);
     }
 

-    private void handleSignalServiceDataMessage(SignalServiceDataMessage message, boolean isSync, String source, SignalServiceAddress destination, boolean ignoreAttachments) {
-        String threadId;
-        if (message.getGroupInfo().isPresent()) {
-            SignalServiceGroup groupInfo = message.getGroupInfo().get();
-            threadId = Base64.encodeBytes(groupInfo.getGroupId());
-            GroupInfo group = account.getGroupStore().getGroup(groupInfo.getGroupId());
-            switch (groupInfo.getType()) {
-                case UPDATE:
-                    if (group == null) {
-                        group = new GroupInfo(groupInfo.getGroupId());
-                    }
+    private static int currentTimeDays() {
+        return (int) TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis());
+    }

 
 

-                    if (groupInfo.getAvatar().isPresent()) {
-                        SignalServiceAttachment avatar = groupInfo.getAvatar().get();
-                        if (avatar.isPointer()) {
-                            try {
-                                retrieveGroupAvatarAttachment(avatar.asPointer(), group.groupId);
-                            } catch (IOException | InvalidMessageException e) {
-                                System.err.println("Failed to retrieve group avatar (" + avatar.asPointer().getId() + "): " + e.getMessage());
+    private GroupsV2AuthorizationString getGroupAuthForToday(
+            final GroupSecretParams groupSecretParams
+    ) throws IOException {
+        final int today = currentTimeDays();
+        // Returns credentials for the next 7 days
+        final HashMap<Integer, AuthCredentialResponse> credentials = groupsV2Api.getCredentials(today);
+        // TODO cache credentials until they expire
+        AuthCredentialResponse authCredentialResponse = credentials.get(today);
+        try {
+            return groupsV2Api.getGroupsV2AuthorizationString(account.getUuid(),
+                    today,
+                    groupSecretParams,
+                    authCredentialResponse);
+        } catch (VerificationFailedException e) {
+            throw new IOException(e);
+        }
+    }
+
+    private List<HandleAction> handleSignalServiceDataMessage(
+            SignalServiceDataMessage message,
+            boolean isSync,
+            SignalServiceAddress source,
+            SignalServiceAddress destination,
+            boolean ignoreAttachments
+    ) {
+        List<HandleAction> actions = new ArrayList<>();
+        if (message.getGroupContext().isPresent()) {
+            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);
+                if (group == null || group instanceof GroupInfoV1) {
+                    GroupInfoV1 groupV1 = (GroupInfoV1) group;
+                    switch (groupInfo.getType()) {
+                        case UPDATE: {
+                            if (groupV1 == null) {
+                                groupV1 = new GroupInfoV1(groupId);

                             }
                             }

-                        }
-                    }

 
 

-                    if (groupInfo.getName().isPresent()) {
-                        group.name = groupInfo.getName().get();
-                    }
+                            if (groupInfo.getAvatar().isPresent()) {
+                                SignalServiceAttachment avatar = groupInfo.getAvatar().get();
+                                if (avatar.isPointer()) {
+                                    try {
+                                        retrieveGroupAvatarAttachment(avatar.asPointer(), groupV1.getGroupId());
+                                    } catch (IOException | InvalidMessageException | MissingConfigurationException e) {
+                                        logger.warn("Failed to retrieve avatar for group {}, ignoring: {}",
+                                                groupId.toBase64(),
+                                                e.getMessage());
+                                    }
+                                }
+                            }

 
 

-                    if (groupInfo.getMembers().isPresent()) {
-                        group.addMembers(groupInfo.getMembers().get());
-                    }
+                            if (groupInfo.getName().isPresent()) {
+                                groupV1.name = groupInfo.getName().get();
+                            }

 
 

-                    account.getGroupStore().updateGroup(group);
-                    break;
-                case DELIVER:
-                    if (group == null) {
-                        try {
-                            sendGroupInfoRequest(groupInfo.getGroupId(), source);
-                        } catch (IOException | EncapsulatedExceptions e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    break;
-                case QUIT:
-                    if (group == null) {
-                        try {
-                            sendGroupInfoRequest(groupInfo.getGroupId(), source);
-                        } catch (IOException | EncapsulatedExceptions e) {
-                            e.printStackTrace();
+                            if (groupInfo.getMembers().isPresent()) {
+                                groupV1.addMembers(groupInfo.getMembers()
+                                        .get()
+                                        .stream()
+                                        .map(this::resolveSignalServiceAddress)
+                                        .collect(Collectors.toSet()));
+                            }
+
+                            account.getGroupStore().updateGroup(groupV1);
+                            break;

                         }
                         }

-                    } else {
-                        group.members.remove(source);
-                        account.getGroupStore().updateGroup(group);
-                    }
-                    break;
-                case REQUEST_INFO:
-                    if (group != null) {
-                        try {
-                            sendUpdateGroupMessage(groupInfo.getGroupId(), source);
-                        } catch (IOException | EncapsulatedExceptions e) {
-                            e.printStackTrace();
-                        } catch (NotAGroupMemberException e) {
-                            // We have left this group, so don't send a group update message
+                        case DELIVER:
+                            if (groupV1 == null && !isSync) {
+                                actions.add(new SendGroupInfoRequestAction(source, groupId));
+                            }
+                            break;
+                        case QUIT: {
+                            if (groupV1 != null) {
+                                groupV1.removeMember(source);
+                                account.getGroupStore().updateGroup(groupV1);
+                            }
+                            break;

                         }
                         }

+                        case REQUEST_INFO:
+                            if (groupV1 != null && !isSync) {
+                                actions.add(new SendGroupUpdateAction(source, groupV1.getGroupId()));
+                            }
+                            break;

                     }
                     }

-                    break;
+                } else {
+                    // Received a group v1 message for a v2 group
+                }

             }
             }

-        } else {
-            if (isSync) {
-                threadId = destination.getNumber().get();
-            } else {
-                threadId = source;
+            if (message.getGroupContext().get().getGroupV2().isPresent()) {
+                final SignalServiceGroupV2 groupContext = message.getGroupContext().get().getGroupV2().get();
+                final GroupMasterKey groupMasterKey = groupContext.getMasterKey();
+
+                getOrMigrateGroup(groupMasterKey,
+                        groupContext.getRevision(),
+                        groupContext.hasSignedGroupChange() ? groupContext.getSignedGroupChange() : null);

             }
         }
             }
         }

-        if (message.isEndSession()) {
-            handleEndSession(isSync ? destination.getNumber().get() : source);
+
+        final SignalServiceAddress conversationPartnerAddress = isSync ? destination : source;
+        if (conversationPartnerAddress != null && message.isEndSession()) {
+            handleEndSession(conversationPartnerAddress);

         }
         if (message.isExpirationUpdate() || message.getBody().isPresent()) {
         }
         if (message.isExpirationUpdate() || message.getBody().isPresent()) {

-            ThreadInfo thread = account.getThreadStore().getThread(threadId);
-            if (thread == null) {
-                thread = new ThreadInfo();
-                thread.id = threadId;
-            }
-            if (thread.messageExpirationTime != message.getExpiresInSeconds()) {
-                thread.messageExpirationTime = message.getExpiresInSeconds();
-                account.getThreadStore().updateThread(thread);
+            if (message.getGroupContext().isPresent()) {
+                if (message.getGroupContext().get().getGroupV1().isPresent()) {
+                    SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();
+                    GroupInfoV1 group = account.getGroupStore().getOrCreateGroupV1(GroupId.v1(groupInfo.getGroupId()));
+                    if (group != null) {
+                        if (group.messageExpirationTime != message.getExpiresInSeconds()) {
+                            group.messageExpirationTime = message.getExpiresInSeconds();
+                            account.getGroupStore().updateGroup(group);
+                        }
+                    }
+                } else if (message.getGroupContext().get().getGroupV2().isPresent()) {
+                    // disappearing message timer already stored in the DecryptedGroup
+                }
+            } else if (conversationPartnerAddress != null) {
+                ContactInfo contact = account.getContactStore().getContact(conversationPartnerAddress);
+                if (contact == null) {
+                    contact = new ContactInfo(conversationPartnerAddress);
+                }
+                if (contact.messageExpirationTime != message.getExpiresInSeconds()) {
+                    contact.messageExpirationTime = message.getExpiresInSeconds();
+                    account.getContactStore().updateContact(contact);
+                }

             }
         }
         if (message.getAttachments().isPresent() && !ignoreAttachments) {
             }
         }
         if (message.getAttachments().isPresent() && !ignoreAttachments) {


@@ -1217,26 +1757,25 @@ public class Manager implements Signal {
                 if (attachment.isPointer()) {
                     try {
                         retrieveAttachment(attachment.asPointer());
                 if (attachment.isPointer()) {
                     try {
                         retrieveAttachment(attachment.asPointer());

-                    } catch (IOException | InvalidMessageException e) {
-                        System.err.println("Failed to retrieve attachment (" + attachment.asPointer().getId() + "): " + e.getMessage());
+                    } catch (IOException | InvalidMessageException | MissingConfigurationException e) {
+                        logger.warn("Failed to retrieve attachment ({}), ignoring: {}",
+                                attachment.asPointer().getRemoteId(),
+                                e.getMessage());

                     }
                 }
             }
         }
         if (message.getProfileKey().isPresent() && message.getProfileKey().get().length == 32) {
                     }
                 }
             }
         }
         if (message.getProfileKey().isPresent() && message.getProfileKey().get().length == 32) {

-            if (source.equals(username)) {
-                try {
-                    this.account.setProfileKey(new ProfileKey(message.getProfileKey().get()));
-                } catch (InvalidInputException ignored) {
-                }
+            final ProfileKey profileKey;
+            try {
+                profileKey = new ProfileKey(message.getProfileKey().get());
+            } catch (InvalidInputException e) {
+                throw new AssertionError(e);

             }
             }

-            ContactInfo contact = account.getContactStore().getContact(source);
-            if (contact == null) {
-                contact = new ContactInfo();
-                contact.number = source;
+            if (source.matches(account.getSelfAddress())) {
+                this.account.setProfileKey(profileKey);

             }
             }

-            contact.profileKey = Base64.encodeBytes(message.getProfileKey().get());
-            account.getContactStore().updateContact(contact);
+            this.account.getProfileStore().storeProfileKey(source, profileKey);

         }
         if (message.getPreviews().isPresent()) {
             final List<SignalServiceDataMessage.Preview> previews = message.getPreviews().get();
         }
         if (message.getPreviews().isPresent()) {
             final List<SignalServiceDataMessage.Preview> previews = message.getPreviews().get();


@@ -1245,21 +1784,112 @@ public class Manager implements Signal {
                     SignalServiceAttachmentPointer attachment = preview.getImage().get().asPointer();
                     try {
                         retrieveAttachment(attachment);
                     SignalServiceAttachmentPointer attachment = preview.getImage().get().asPointer();
                     try {
                         retrieveAttachment(attachment);

-                    } catch (IOException | InvalidMessageException e) {
-                        System.err.println("Failed to retrieve attachment (" + attachment.getId() + "): " + e.getMessage());
+                    } catch (IOException | InvalidMessageException | MissingConfigurationException e) {
+                        logger.warn("Failed to retrieve preview image ({}), ignoring: {}",
+                                attachment.getRemoteId(),
+                                e.getMessage());
+                    }
+                }
+            }
+        }
+        if (message.getQuote().isPresent()) {
+            final SignalServiceDataMessage.Quote quote = message.getQuote().get();
+
+            for (SignalServiceDataMessage.Quote.QuotedAttachment quotedAttachment : quote.getAttachments()) {
+                final SignalServiceAttachment attachment = quotedAttachment.getThumbnail();
+                if (attachment != null && attachment.isPointer()) {
+                    try {
+                        retrieveAttachment(attachment.asPointer());
+                    } catch (IOException | InvalidMessageException | MissingConfigurationException e) {
+                        logger.warn("Failed to retrieve quote attachment thumbnail ({}), ignoring: {}",
+                                attachment.asPointer().getRemoteId(),
+                                e.getMessage());
+                    }
+                }
+            }
+        }
+        if (message.getSticker().isPresent()) {
+            final SignalServiceDataMessage.Sticker messageSticker = message.getSticker().get();
+            Sticker sticker = account.getStickerStore().getSticker(messageSticker.getPackId());
+            if (sticker == null) {
+                sticker = new Sticker(messageSticker.getPackId(), messageSticker.getPackKey());
+                account.getStickerStore().updateSticker(sticker);
+            }
+        }
+        return actions;
+    }
+
+    private GroupInfoV2 getOrMigrateGroup(
+            final GroupMasterKey groupMasterKey, final int revision, final byte[] signedGroupChange
+    ) {
+        final GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
+
+        GroupIdV2 groupId = GroupUtils.getGroupIdV2(groupSecretParams);
+        GroupInfo groupInfo = account.getGroupStore().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
+            account.getGroupStore().deleteGroup(groupInfo.getGroupId());
+            groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey);
+            logger.info("Locally migrated group {} to group v2, id: {}",
+                    groupInfo.getGroupId().toBase64(),
+                    groupInfoV2.getGroupId().toBase64());
+        } else if (groupInfo instanceof GroupInfoV2) {
+            groupInfoV2 = (GroupInfoV2) groupInfo;
+        } else {
+            groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey);
+        }
+
+        if (groupInfoV2.getGroup() == null || groupInfoV2.getGroup().getRevision() < revision) {
+            DecryptedGroup group = null;
+            if (signedGroupChange != null
+                    && groupInfoV2.getGroup() != null
+                    && groupInfoV2.getGroup().getRevision() + 1 == revision) {
+                group = groupHelper.getUpdatedDecryptedGroup(groupInfoV2.getGroup(), signedGroupChange, groupMasterKey);
+            }
+            if (group == null) {
+                group = groupHelper.getDecryptedGroup(groupSecretParams);
+            }
+            if (group != null) {
+                storeProfileKeysFromMembers(group);
+                final String avatar = group.getAvatar();
+                if (avatar != null && !avatar.isEmpty()) {
+                    try {
+                        retrieveGroupAvatar(groupId, groupSecretParams, avatar);
+                    } catch (IOException e) {
+                        logger.warn("Failed to download group avatar, ignoring: {}", e.getMessage());

                     }
                 }
             }
                     }
                 }
             }

+            groupInfoV2.setGroup(group);
+            account.getGroupStore().updateGroup(groupInfoV2);
+        }
+
+        return groupInfoV2;
+    }
+
+    private void storeProfileKeysFromMembers(final DecryptedGroup group) {
+        for (DecryptedMember member : group.getMembersList()) {
+            final SignalServiceAddress address = resolveSignalServiceAddress(new SignalServiceAddress(UuidUtil.parseOrThrow(
+                    member.getUuid().toByteArray()), null));
+            try {
+                account.getProfileStore()
+                        .storeProfileKey(address, new ProfileKey(member.getProfileKey().toByteArray()));
+            } catch (InvalidInputException ignored) {
+            }

         }
     }
 
         }
     }
 

-    private void retryFailedReceivedMessages(ReceiveMessageHandler handler, boolean ignoreAttachments) {
-        final File cachePath = new File(getMessageCachePath());
+    private void retryFailedReceivedMessages(
+            ReceiveMessageHandler handler, boolean ignoreAttachments
+    ) {
+        final File cachePath = getMessageCachePath();

         if (!cachePath.exists()) {
             return;
         }
         for (final File dir : Objects.requireNonNull(cachePath.listFiles())) {
             if (!dir.isDirectory()) {
         if (!cachePath.exists()) {
             return;
         }
         for (final File dir : Objects.requireNonNull(cachePath.listFiles())) {
             if (!dir.isDirectory()) {

+                retryFailedReceivedMessage(handler, ignoreAttachments, dir);

                 continue;
             }
 
                 continue;
             }
 


@@ -1267,103 +1897,169 @@ public class Manager implements Signal {
                 if (!fileEntry.isFile()) {
                     continue;
                 }
                 if (!fileEntry.isFile()) {
                     continue;
                 }

-                SignalServiceEnvelope envelope;
+                retryFailedReceivedMessage(handler, ignoreAttachments, fileEntry);
+            }
+            // Try to delete directory if empty
+            dir.delete();
+        }
+    }
+
+    private void retryFailedReceivedMessage(
+            final ReceiveMessageHandler handler, final boolean ignoreAttachments, final File fileEntry
+    ) {
+        SignalServiceEnvelope envelope;
+        try {
+            envelope = MessageCacheUtils.loadEnvelope(fileEntry);
+            if (envelope == null) {
+                return;
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            return;
+        }
+        SignalServiceContent content = null;
+        if (!envelope.isReceipt()) {
+            try {
+                content = decryptMessage(envelope);
+            } catch (org.whispersystems.libsignal.UntrustedIdentityException e) {
+                return;
+            } catch (Exception er) {
+                // All other errors are not recoverable, so delete the cached message

                 try {
                 try {

-                    envelope = Utils.loadEnvelope(fileEntry);
-                    if (envelope == null) {
-                        continue;
-                    }
+                    Files.delete(fileEntry.toPath());

                 } catch (IOException e) {
                 } catch (IOException e) {

-                    e.printStackTrace();
-                    continue;
-                }
-                SignalServiceContent content = null;
-                if (!envelope.isReceipt()) {
-                    try {
-                        content = decryptMessage(envelope);
-                    } catch (Exception e) {
-                        continue;
-                    }
-                    handleMessage(envelope, content, ignoreAttachments);
+                    logger.warn("Failed to delete cached message file “{}”, ignoring: {}", fileEntry, e.getMessage());

                 }
                 }

-                account.save();
-                handler.handleMessage(envelope, content, null);
+                return;
+            }
+            List<HandleAction> actions = handleMessage(envelope, content, ignoreAttachments);
+            for (HandleAction action : actions) {

                 try {
                 try {

-                    Files.delete(fileEntry.toPath());
-                } catch (IOException e) {
-                    System.err.println("Failed to delete cached message file “" + fileEntry + "”: " + e.getMessage());
+                    action.execute(this);
+                } catch (Throwable e) {
+                    e.printStackTrace();

                 }
             }
                 }
             }

-            // Try to delete directory if empty
-            dir.delete();
+        }
+        account.save();
+        handler.handleMessage(envelope, content, null);
+        try {
+            Files.delete(fileEntry.toPath());
+        } catch (IOException e) {
+            logger.warn("Failed to delete cached message file “{}”, ignoring: {}", fileEntry, e.getMessage());

         }
     }
 
         }
     }
 

-    public void receiveMessages(long timeout, TimeUnit unit, boolean returnOnTimeout, boolean ignoreAttachments, ReceiveMessageHandler handler) throws IOException {
+    public void receiveMessages(
+            long timeout,
+            TimeUnit unit,
+            boolean returnOnTimeout,
+            boolean ignoreAttachments,
+            ReceiveMessageHandler handler
+    ) throws IOException {

         retryFailedReceivedMessages(handler, ignoreAttachments);
         retryFailedReceivedMessages(handler, ignoreAttachments);

-        final SignalServiceMessageReceiver messageReceiver = getMessageReceiver();

 
 

-        try {
-            if (messagePipe == null) {
-                messagePipe = messageReceiver.createMessagePipe();
+        Set<HandleAction> queuedActions = null;
+
+        getOrCreateMessagePipe();
+
+        boolean hasCaughtUpWithOldMessages = false;
+
+        while (true) {
+            SignalServiceEnvelope envelope;
+            SignalServiceContent content = null;
+            Exception exception = null;
+            final long now = new Date().getTime();
+            try {
+                Optional<SignalServiceEnvelope> result = messagePipe.readOrEmpty(timeout, unit, envelope1 -> {
+                    // store message on disk, before acknowledging receipt to the server
+                    try {
+                        String source = envelope1.getSourceE164().isPresent() ? envelope1.getSourceE164().get() : "";
+                        File cacheFile = getMessageCacheFile(source, now, envelope1.getTimestamp());
+                        MessageCacheUtils.storeEnvelope(envelope1, cacheFile);
+                    } catch (IOException e) {
+                        logger.warn("Failed to store encrypted message in disk cache, ignoring: {}", e.getMessage());
+                    }
+                });
+                if (result.isPresent()) {
+                    envelope = result.get();
+                } else {
+                    // Received indicator that server queue is empty
+                    hasCaughtUpWithOldMessages = true;
+
+                    if (queuedActions != null) {
+                        for (HandleAction action : queuedActions) {
+                            try {
+                                action.execute(this);
+                            } catch (Throwable e) {
+                                e.printStackTrace();
+                            }
+                        }
+                        account.save();
+                        queuedActions.clear();
+                        queuedActions = null;
+                    }
+
+                    // Continue to wait another timeout for new messages
+                    continue;
+                }
+            } catch (TimeoutException e) {
+                if (returnOnTimeout) return;
+                continue;
+            } catch (InvalidVersionException e) {
+                logger.warn("Error while receiving messages, ignoring: {}", e.getMessage());
+                continue;

             }
 
             }
 

-            while (true) {
-                SignalServiceEnvelope envelope;
-                SignalServiceContent content = null;
-                Exception exception = null;
-                final long now = new Date().getTime();
+            if (envelope.hasSource()) {
+                // Store uuid if we don't have it already
+                SignalServiceAddress source = envelope.getSourceAddress();
+                resolveSignalServiceAddress(source);
+            }
+            if (!envelope.isReceipt()) {

                 try {
                 try {

-                    envelope = messagePipe.read(timeout, unit, envelope1 -> {
-                        // store message on disk, before acknowledging receipt to the server
+                    content = decryptMessage(envelope);
+                } catch (Exception e) {
+                    exception = e;
+                }
+                List<HandleAction> actions = handleMessage(envelope, content, ignoreAttachments);
+                if (hasCaughtUpWithOldMessages) {
+                    for (HandleAction action : actions) {

                         try {
                         try {

-                            File cacheFile = getMessageCacheFile(envelope1.getSourceE164().get(), now, envelope1.getTimestamp());
-                            Utils.storeEnvelope(envelope1, cacheFile);
-                        } catch (IOException e) {
-                            System.err.println("Failed to store encrypted message in disk cache, ignoring: " + e.getMessage());
+                            action.execute(this);
+                        } catch (Throwable e) {
+                            e.printStackTrace();

                         }
                         }

-                    });
-                } catch (TimeoutException e) {
-                    if (returnOnTimeout)
-                        return;
-                    continue;
-                } catch (InvalidVersionException e) {
-                    System.err.println("Ignoring error: " + e.getMessage());
-                    continue;
-                }
-                if (!envelope.isReceipt()) {
-                    try {
-                        content = decryptMessage(envelope);
-                    } catch (Exception e) {
-                        exception = e;

                     }
                     }

-                    handleMessage(envelope, content, ignoreAttachments);
-                }
-                account.save();
-                if (!isMessageBlocked(envelope, content)) {
-                    handler.handleMessage(envelope, content, exception);
-                }
-                if (!(exception instanceof ProtocolUntrustedIdentityException)) {
-                    File cacheFile = null;
-                    try {
-                        cacheFile = getMessageCacheFile(envelope.getSourceE164().get(), now, envelope.getTimestamp());
-                        Files.delete(cacheFile.toPath());
-                        // Try to delete directory if empty
-                        new File(getMessageCachePath()).delete();
-                    } catch (IOException e) {
-                        System.err.println("Failed to delete cached message file “" + cacheFile + "”: " + e.getMessage());
+                } else {
+                    if (queuedActions == null) {
+                        queuedActions = new HashSet<>();

                     }
                     }

+                    queuedActions.addAll(actions);

                 }
             }
                 }
             }

-        } finally {
-            if (messagePipe != null) {
-                messagePipe.shutdown();
-                messagePipe = null;
+            account.save();
+            if (!isMessageBlocked(envelope, content)) {
+                handler.handleMessage(envelope, content, exception);
+            }
+            if (!(exception instanceof org.whispersystems.libsignal.UntrustedIdentityException)) {
+                File cacheFile = null;
+                try {
+                    String source = envelope.getSourceE164().isPresent() ? envelope.getSourceE164().get() : "";
+                    cacheFile = getMessageCacheFile(source, now, envelope.getTimestamp());
+                    Files.delete(cacheFile.toPath());
+                    // Try to delete directory if empty
+                    getMessageCachePath().delete();
+                } catch (IOException e) {
+                    logger.warn("Failed to delete cached message file “{}”, ignoring: {}", cacheFile, e.getMessage());
+                }

             }
         }
     }
 
             }
         }
     }
 

-    private boolean isMessageBlocked(SignalServiceEnvelope envelope, SignalServiceContent content) {
+    private boolean isMessageBlocked(
+            SignalServiceEnvelope envelope, SignalServiceContent content
+    ) {

         SignalServiceAddress source;
         if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
             source = envelope.getSourceAddress();
         SignalServiceAddress source;
         if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
             source = envelope.getSourceAddress();


@@ -1372,17 +2068,23 @@ public class Manager implements Signal {
         } else {
             return false;
         }
         } else {
             return false;
         }

-        ContactInfo sourceContact = getContact(source.getNumber().get());
+        ContactInfo sourceContact = account.getContactStore().getContact(source);

         if (sourceContact != null && sourceContact.blocked) {
             return true;
         }
 
         if (content != null && content.getDataMessage().isPresent()) {
             SignalServiceDataMessage message = content.getDataMessage().get();
         if (sourceContact != null && sourceContact.blocked) {
             return true;
         }
 
         if (content != null && content.getDataMessage().isPresent()) {
             SignalServiceDataMessage message = content.getDataMessage().get();

-            if (message.getGroupInfo().isPresent()) {
-                SignalServiceGroup groupInfo = message.getGroupInfo().get();
-                GroupInfo group = getGroup(groupInfo.getGroupId());
-                if (groupInfo.getType() == SignalServiceGroup.Type.DELIVER && group != null && group.blocked) {
+            if (message.getGroupContext().isPresent()) {
+                if (message.getGroupContext().get().getGroupV1().isPresent()) {
+                    SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();
+                    if (groupInfo.getType() != SignalServiceGroup.Type.DELIVER) {
+                        return false;
+                    }
+                }
+                GroupId groupId = GroupUtils.getGroupId(message.getGroupContext().get());
+                GroupInfo group = account.getGroupStore().getGroup(groupId);
+                if (group != null && group.isBlocked()) {

                     return true;
                 }
             }
                     return true;
                 }
             }


@@ -1390,90 +2092,111 @@ public class Manager implements Signal {
         return false;
     }
 
         return false;
     }
 

-    private void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, boolean ignoreAttachments) {
+    private List<HandleAction> handleMessage(
+            SignalServiceEnvelope envelope, SignalServiceContent content, boolean ignoreAttachments
+    ) {
+        List<HandleAction> actions = new ArrayList<>();

         if (content != null) {
         if (content != null) {

-            SignalServiceAddress sender;
+            final SignalServiceAddress sender;

             if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
                 sender = envelope.getSourceAddress();
             } else {
                 sender = content.getSender();
             }
             if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
                 sender = envelope.getSourceAddress();
             } else {
                 sender = content.getSender();
             }

+            // Store uuid if we don't have it already
+            resolveSignalServiceAddress(sender);
+

             if (content.getDataMessage().isPresent()) {
                 SignalServiceDataMessage message = content.getDataMessage().get();
             if (content.getDataMessage().isPresent()) {
                 SignalServiceDataMessage message = content.getDataMessage().get();

-                handleSignalServiceDataMessage(message, false, sender.getNumber().get(), getSelfAddress(), ignoreAttachments);
+
+                if (content.isNeedsReceipt()) {
+                    actions.add(new SendReceiptAction(sender, message.getTimestamp()));
+                }
+
+                actions.addAll(handleSignalServiceDataMessage(message,
+                        false,
+                        sender,
+                        account.getSelfAddress(),
+                        ignoreAttachments));

             }
             if (content.getSyncMessage().isPresent()) {
                 account.setMultiDevice(true);
                 SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
                 if (syncMessage.getSent().isPresent()) {
                     SentTranscriptMessage message = syncMessage.getSent().get();
             }
             if (content.getSyncMessage().isPresent()) {
                 account.setMultiDevice(true);
                 SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
                 if (syncMessage.getSent().isPresent()) {
                     SentTranscriptMessage message = syncMessage.getSent().get();

-                    handleSignalServiceDataMessage(message.getMessage(), true, sender.getNumber().get(), message.getDestination().orNull(), ignoreAttachments);
+                    final SignalServiceAddress destination = message.getDestination().orNull();
+                    actions.addAll(handleSignalServiceDataMessage(message.getMessage(),
+                            true,
+                            sender,
+                            destination,
+                            ignoreAttachments));

                 }
                 if (syncMessage.getRequest().isPresent()) {
                     RequestMessage rm = syncMessage.getRequest().get();
                     if (rm.isContactsRequest()) {
                 }
                 if (syncMessage.getRequest().isPresent()) {
                     RequestMessage rm = syncMessage.getRequest().get();
                     if (rm.isContactsRequest()) {

-                        try {
-                            sendContacts();
-                        } catch (UntrustedIdentityException | IOException e) {
-                            e.printStackTrace();
-                        }
+                        actions.add(SendSyncContactsAction.create());

                     }
                     if (rm.isGroupsRequest()) {
                     }
                     if (rm.isGroupsRequest()) {

-                        try {
-                            sendGroups();
-                        } catch (UntrustedIdentityException | IOException e) {
-                            e.printStackTrace();
-                        }
+                        actions.add(SendSyncGroupsAction.create());

                     }
                     if (rm.isBlockedListRequest()) {
                     }
                     if (rm.isBlockedListRequest()) {

-                        try {
-                            sendBlockedList();
-                        } catch (UntrustedIdentityException | IOException e) {
-                            e.printStackTrace();
-                        }
+                        actions.add(SendSyncBlockedListAction.create());

                     }
                     }

-                    // TODO Handle rm.isConfigurationRequest();
+                    // TODO Handle rm.isConfigurationRequest(); rm.isKeysRequest();

                 }
                 if (syncMessage.getGroups().isPresent()) {
                     File tmpFile = null;
                     try {
                         tmpFile = IOUtils.createTempFile();
                 }
                 if (syncMessage.getGroups().isPresent()) {
                     File tmpFile = null;
                     try {
                         tmpFile = IOUtils.createTempFile();

-                        try (InputStream attachmentAsStream = retrieveAttachmentAsStream(syncMessage.getGroups().get().asPointer(), tmpFile)) {
+                        try (InputStream attachmentAsStream = retrieveAttachmentAsStream(syncMessage.getGroups()
+                                .get()
+                                .asPointer(), tmpFile)) {

                             DeviceGroupsInputStream s = new DeviceGroupsInputStream(attachmentAsStream);
                             DeviceGroup g;
                             while ((g = s.read()) != null) {
                             DeviceGroupsInputStream s = new DeviceGroupsInputStream(attachmentAsStream);
                             DeviceGroup g;
                             while ((g = s.read()) != null) {

-                                GroupInfo syncGroup = account.getGroupStore().getGroup(g.getId());
-                                if (syncGroup == null) {
-                                    syncGroup = new GroupInfo(g.getId());
-                                }
-                                if (g.getName().isPresent()) {
-                                    syncGroup.name = g.getName().get();
-                                }
-                                syncGroup.addMembers(g.getMembers());
-                                if (!g.isActive()) {
-                                    syncGroup.members.remove(username);
-                                }
-                                syncGroup.blocked = g.isBlocked();
-                                if (g.getColor().isPresent()) {
-                                    syncGroup.color = g.getColor().get();
-                                }
+                                GroupInfoV1 syncGroup = account.getGroupStore()
+                                        .getOrCreateGroupV1(GroupId.v1(g.getId()));
+                                if (syncGroup != null) {
+                                    if (g.getName().isPresent()) {
+                                        syncGroup.name = g.getName().get();
+                                    }
+                                    syncGroup.addMembers(g.getMembers()
+                                            .stream()
+                                            .map(this::resolveSignalServiceAddress)
+                                            .collect(Collectors.toSet()));
+                                    if (!g.isActive()) {
+                                        syncGroup.removeMember(account.getSelfAddress());
+                                    } else {
+                                        // Add ourself to the member set as it's marked as active
+                                        syncGroup.addMembers(List.of(account.getSelfAddress()));
+                                    }
+                                    syncGroup.blocked = g.isBlocked();
+                                    if (g.getColor().isPresent()) {
+                                        syncGroup.color = g.getColor().get();
+                                    }

 
 

-                                if (g.getAvatar().isPresent()) {
-                                    retrieveGroupAvatarAttachment(g.getAvatar().get(), syncGroup.groupId);
+                                    if (g.getAvatar().isPresent()) {
+                                        retrieveGroupAvatarAttachment(g.getAvatar().get(), syncGroup.getGroupId());
+                                    }
+                                    syncGroup.inboxPosition = g.getInboxPosition().orNull();
+                                    syncGroup.archived = g.isArchived();
+                                    account.getGroupStore().updateGroup(syncGroup);

                                 }
                                 }

-                                syncGroup.inboxPosition = g.getInboxPosition().orNull();
-                                syncGroup.archived = g.isArchived();
-                                account.getGroupStore().updateGroup(syncGroup);

                             }
                         }
                     } catch (Exception e) {
                             }
                         }
                     } catch (Exception e) {

+                        logger.warn("Failed to handle received sync groups “{}”, ignoring: {}",
+                                tmpFile,
+                                e.getMessage());

                         e.printStackTrace();
                     } finally {
                         if (tmpFile != null) {
                             try {
                                 Files.delete(tmpFile.toPath());
                             } catch (IOException e) {
                         e.printStackTrace();
                     } finally {
                         if (tmpFile != null) {
                             try {
                                 Files.delete(tmpFile.toPath());
                             } catch (IOException e) {

-                                System.err.println("Failed to delete received groups temp file “" + tmpFile + "”: " + e.getMessage());
+                                logger.warn("Failed to delete received groups temp file “{}”, ignoring: {}",
+                                        tmpFile,
+                                        e.getMessage());

                             }
                         }
                     }
                             }
                         }
                     }


@@ -1481,19 +2204,17 @@ public class Manager implements Signal {
                 if (syncMessage.getBlockedList().isPresent()) {
                     final BlockedListMessage blockedListMessage = syncMessage.getBlockedList().get();
                     for (SignalServiceAddress address : blockedListMessage.getAddresses()) {
                 if (syncMessage.getBlockedList().isPresent()) {
                     final BlockedListMessage blockedListMessage = syncMessage.getBlockedList().get();
                     for (SignalServiceAddress address : blockedListMessage.getAddresses()) {

-                        if (address.getNumber().isPresent()) {
-                            try {
-                                setContactBlocked(address.getNumber().get(), true);
-                            } catch (InvalidNumberException e) {
-                                e.printStackTrace();
-                            }
-                        }
+                        setContactBlocked(resolveSignalServiceAddress(address), true);

                     }
                     }

-                    for (byte[] groupId : blockedListMessage.getGroupIds()) {
+                    for (GroupId groupId : blockedListMessage.getGroupIds()
+                            .stream()
+                            .map(GroupId::unknownVersion)
+                            .collect(Collectors.toSet())) {

                         try {
                             setGroupBlocked(groupId, true);
                         } catch (GroupNotFoundException e) {
                         try {
                             setGroupBlocked(groupId, true);
                         } catch (GroupNotFoundException e) {

-                            System.err.println("BlockedListMessage contained groupID that was not found in GroupStore: " + Base64.encodeBytes(groupId));
+                            logger.warn("BlockedListMessage contained groupID that was not found in GroupStore: {}",
+                                    groupId.toBase64());

                         }
                     }
                 }
                         }
                     }
                 }


@@ -1502,7 +2223,8 @@ public class Manager implements Signal {
                     try {
                         tmpFile = IOUtils.createTempFile();
                         final ContactsMessage contactsMessage = syncMessage.getContacts().get();
                     try {
                         tmpFile = IOUtils.createTempFile();
                         final ContactsMessage contactsMessage = syncMessage.getContacts().get();

-                        try (InputStream attachmentAsStream = retrieveAttachmentAsStream(contactsMessage.getContactsStream().asPointer(), tmpFile)) {
+                        try (InputStream attachmentAsStream = retrieveAttachmentAsStream(contactsMessage.getContactsStream()
+                                .asPointer(), tmpFile)) {

                             DeviceContactsInputStream s = new DeviceContactsInputStream(attachmentAsStream);
                             if (contactsMessage.isComplete()) {
                                 account.getContactStore().clear();
                             DeviceContactsInputStream s = new DeviceContactsInputStream(attachmentAsStream);
                             if (contactsMessage.isComplete()) {
                                 account.getContactStore().clear();


@@ -1512,10 +2234,10 @@ public class Manager implements Signal {
                                 if (c.getAddress().matches(account.getSelfAddress()) && c.getProfileKey().isPresent()) {
                                     account.setProfileKey(c.getProfileKey().get());
                                 }
                                 if (c.getAddress().matches(account.getSelfAddress()) && c.getProfileKey().isPresent()) {
                                     account.setProfileKey(c.getProfileKey().get());
                                 }

-                                ContactInfo contact = account.getContactStore().getContact(c.getAddress().getNumber().get());
+                                final SignalServiceAddress address = resolveSignalServiceAddress(c.getAddress());
+                                ContactInfo contact = account.getContactStore().getContact(address);

                                 if (contact == null) {
                                 if (contact == null) {

-                                    contact = new ContactInfo();
-                                    contact.number = c.getAddress().getNumber().get();
+                                    contact = new ContactInfo(address);

                                 }
                                 if (c.getName().isPresent()) {
                                     contact.name = c.getName().get();
                                 }
                                 if (c.getName().isPresent()) {
                                     contact.name = c.getName().get();


@@ -1524,20 +2246,17 @@ public class Manager implements Signal {
                                     contact.color = c.getColor().get();
                                 }
                                 if (c.getProfileKey().isPresent()) {
                                     contact.color = c.getColor().get();
                                 }
                                 if (c.getProfileKey().isPresent()) {

-                                    contact.profileKey = Base64.encodeBytes(c.getProfileKey().get().serialize());
+                                    account.getProfileStore().storeProfileKey(address, c.getProfileKey().get());

                                 }
                                 if (c.getVerified().isPresent()) {
                                     final VerifiedMessage verifiedMessage = c.getVerified().get();
                                 }
                                 if (c.getVerified().isPresent()) {
                                     final VerifiedMessage verifiedMessage = c.getVerified().get();

-                                    account.getSignalProtocolStore().saveIdentity(verifiedMessage.getDestination().getNumber().get(), verifiedMessage.getIdentityKey(), TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
+                                    account.getSignalProtocolStore()
+                                            .setIdentityTrustLevel(verifiedMessage.getDestination(),
+                                                    verifiedMessage.getIdentityKey(),
+                                                    TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));

                                 }
                                 if (c.getExpirationTimer().isPresent()) {
                                 }
                                 if (c.getExpirationTimer().isPresent()) {

-                                    ThreadInfo thread = account.getThreadStore().getThread(c.getAddress().getNumber().get());
-                                    if (thread == null) {
-                                        thread = new ThreadInfo();
-                                        thread.id = c.getAddress().getNumber().get();
-                                    }
-                                    thread.messageExpirationTime = c.getExpirationTimer().get();
-                                    account.getThreadStore().updateThread(thread);
+                                    contact.messageExpirationTime = c.getExpirationTimer().get();

                                 }
                                 contact.blocked = c.isBlocked();
                                 contact.inboxPosition = c.getInboxPosition().orNull();
                                 }
                                 contact.blocked = c.isBlocked();
                                 contact.inboxPosition = c.getInboxPosition().orNull();


@@ -1556,62 +2275,154 @@ public class Manager implements Signal {
                             try {
                                 Files.delete(tmpFile.toPath());
                             } catch (IOException e) {
                             try {
                                 Files.delete(tmpFile.toPath());
                             } catch (IOException e) {

-                                System.err.println("Failed to delete received contacts temp file “" + tmpFile + "”: " + e.getMessage());
+                                logger.warn("Failed to delete received contacts temp file “{}”, ignoring: {}",
+                                        tmpFile,
+                                        e.getMessage());

                             }
                         }
                     }
                 }
                 if (syncMessage.getVerified().isPresent()) {
                     final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();
                             }
                         }
                     }
                 }
                 if (syncMessage.getVerified().isPresent()) {
                     final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();

-                    account.getSignalProtocolStore().saveIdentity(verifiedMessage.getDestination().getNumber().get(), verifiedMessage.getIdentityKey(), TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
+                    account.getSignalProtocolStore()
+                            .setIdentityTrustLevel(resolveSignalServiceAddress(verifiedMessage.getDestination()),
+                                    verifiedMessage.getIdentityKey(),
+                                    TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
+                }
+                if (syncMessage.getStickerPackOperations().isPresent()) {
+                    final List<StickerPackOperationMessage> stickerPackOperationMessages = syncMessage.getStickerPackOperations()
+                            .get();
+                    for (StickerPackOperationMessage m : stickerPackOperationMessages) {
+                        if (!m.getPackId().isPresent()) {
+                            continue;
+                        }
+                        Sticker sticker = account.getStickerStore().getSticker(m.getPackId().get());
+                        if (sticker == null) {
+                            if (!m.getPackKey().isPresent()) {
+                                continue;
+                            }
+                            sticker = new Sticker(m.getPackId().get(), m.getPackKey().get());
+                        }
+                        sticker.setInstalled(!m.getType().isPresent()
+                                || m.getType().get() == StickerPackOperationMessage.Type.INSTALL);
+                        account.getStickerStore().updateSticker(sticker);
+                    }

                 }
                 if (syncMessage.getConfiguration().isPresent()) {
                     // TODO
                 }
             }
         }
                 }
                 if (syncMessage.getConfiguration().isPresent()) {
                     // TODO
                 }
             }
         }

+        return actions;

     }
 
     private File getContactAvatarFile(String number) {
     }
 
     private File getContactAvatarFile(String number) {

-        return new File(avatarsPath, "contact-" + number);
+        return new File(pathConfig.getAvatarsPath(), "contact-" + number);

     }
 
     }
 

-    private File retrieveContactAvatarAttachment(SignalServiceAttachment attachment, String number) throws IOException, InvalidMessageException {
-        IOUtils.createPrivateDirectories(avatarsPath);
+    private File retrieveContactAvatarAttachment(
+            SignalServiceAttachment attachment, String number
+    ) throws IOException, InvalidMessageException, MissingConfigurationException {
+        IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());

         if (attachment.isPointer()) {
             SignalServiceAttachmentPointer pointer = attachment.asPointer();
             return retrieveAttachment(pointer, getContactAvatarFile(number), false);
         } else {
             SignalServiceAttachmentStream stream = attachment.asStream();
         if (attachment.isPointer()) {
             SignalServiceAttachmentPointer pointer = attachment.asPointer();
             return retrieveAttachment(pointer, getContactAvatarFile(number), false);
         } else {
             SignalServiceAttachmentStream stream = attachment.asStream();

-            return Utils.retrieveAttachment(stream, getContactAvatarFile(number));
+            return AttachmentUtils.retrieveAttachment(stream, getContactAvatarFile(number));

         }
     }
 
         }
     }
 

-    private File getGroupAvatarFile(byte[] groupId) {
-        return new File(avatarsPath, "group-" + Base64.encodeBytes(groupId).replace("/", "_"));
+    private File getGroupAvatarFile(GroupId groupId) {
+        return new File(pathConfig.getAvatarsPath(), "group-" + groupId.toBase64().replace("/", "_"));

     }
 
     }
 

-    private File retrieveGroupAvatarAttachment(SignalServiceAttachment attachment, byte[] groupId) throws IOException, InvalidMessageException {
-        IOUtils.createPrivateDirectories(avatarsPath);
+    private File retrieveGroupAvatarAttachment(
+            SignalServiceAttachment attachment, GroupId groupId
+    ) throws IOException, InvalidMessageException, MissingConfigurationException {
+        IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());

         if (attachment.isPointer()) {
             SignalServiceAttachmentPointer pointer = attachment.asPointer();
             return retrieveAttachment(pointer, getGroupAvatarFile(groupId), false);
         } else {
             SignalServiceAttachmentStream stream = attachment.asStream();
         if (attachment.isPointer()) {
             SignalServiceAttachmentPointer pointer = attachment.asPointer();
             return retrieveAttachment(pointer, getGroupAvatarFile(groupId), false);
         } else {
             SignalServiceAttachmentStream stream = attachment.asStream();

-            return Utils.retrieveAttachment(stream, getGroupAvatarFile(groupId));
+            return AttachmentUtils.retrieveAttachment(stream, getGroupAvatarFile(groupId));

         }
     }
 
         }
     }
 

-    public File getAttachmentFile(long attachmentId) {
-        return new File(attachmentsPath, attachmentId + "");
+    private File retrieveGroupAvatar(
+            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();
+        try (InputStream input = receiver.retrieveGroupsV2ProfileAvatar(cdnKey,
+                tmpFile,
+                ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
+            byte[] encryptedData = IOUtils.readFully(input);
+
+            byte[] decryptedData = groupOperations.decryptAvatar(encryptedData);
+            try (OutputStream output = new FileOutputStream(outputFile)) {
+                output.write(decryptedData);
+            }
+        } finally {
+            try {
+                Files.delete(tmpFile.toPath());
+            } catch (IOException e) {
+                logger.warn("Failed to delete received group avatar temp file “{}”, ignoring: {}",
+                        tmpFile,
+                        e.getMessage());
+            }
+        }
+        return outputFile;
+    }
+
+    private File getProfileAvatarFile(SignalServiceAddress address) {
+        return new File(pathConfig.getAvatarsPath(), "profile-" + address.getLegacyIdentifier());
+    }
+
+    private File retrieveProfileAvatar(
+            SignalServiceAddress address, String avatarPath, ProfileKey profileKey
+    ) throws IOException {
+        IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());
+        SignalServiceMessageReceiver receiver = getOrCreateMessageReceiver();
+        File outputFile = getProfileAvatarFile(address);
+
+        File tmpFile = IOUtils.createTempFile();
+        try (InputStream input = receiver.retrieveProfileAvatar(avatarPath,
+                tmpFile,
+                profileKey,
+                ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
+            // Use larger buffer size to prevent AssertionError: Need: 12272 but only have: 8192 ...
+            IOUtils.copyStreamToFile(input, outputFile, (int) ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE);
+        } finally {
+            try {
+                Files.delete(tmpFile.toPath());
+            } catch (IOException e) {
+                logger.warn("Failed to delete received profile avatar temp file “{}”, ignoring: {}",
+                        tmpFile,
+                        e.getMessage());
+            }
+        }
+        return outputFile;
+    }
+
+    public File getAttachmentFile(SignalServiceAttachmentRemoteId attachmentId) {
+        return new File(pathConfig.getAttachmentsPath(), attachmentId.toString());

     }
 
     }
 

-    private File retrieveAttachment(SignalServiceAttachmentPointer pointer) throws IOException, InvalidMessageException {
-        IOUtils.createPrivateDirectories(attachmentsPath);
-        return retrieveAttachment(pointer, getAttachmentFile(pointer.getId()), true);
+    private File retrieveAttachment(SignalServiceAttachmentPointer pointer) throws IOException, InvalidMessageException, MissingConfigurationException {
+        IOUtils.createPrivateDirectories(pathConfig.getAttachmentsPath());
+        return retrieveAttachment(pointer, getAttachmentFile(pointer.getRemoteId()), true);

     }
 
     }
 

-    private File retrieveAttachment(SignalServiceAttachmentPointer pointer, File outputFile, boolean storePreview) throws IOException, InvalidMessageException {
+    private File retrieveAttachment(
+            SignalServiceAttachmentPointer pointer, File outputFile, boolean storePreview
+    ) throws IOException, InvalidMessageException, MissingConfigurationException {

         if (storePreview && pointer.getPreview().isPresent()) {
             File previewFile = new File(outputFile + ".preview");
             try (OutputStream output = new FileOutputStream(previewFile)) {
         if (storePreview && pointer.getPreview().isPresent()) {
             File previewFile = new File(outputFile + ".preview");
             try (OutputStream output = new FileOutputStream(previewFile)) {


@@ -1623,53 +2434,52 @@ public class Manager implements Signal {
             }
         }
 
             }
         }
 

-        final SignalServiceMessageReceiver messageReceiver = getMessageReceiver();
+        final SignalServiceMessageReceiver messageReceiver = getOrCreateMessageReceiver();

 
         File tmpFile = IOUtils.createTempFile();
 
         File tmpFile = IOUtils.createTempFile();

-        try (InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile, BaseConfig.MAX_ATTACHMENT_SIZE)) {
-            try (OutputStream output = new FileOutputStream(outputFile)) {
-                byte[] buffer = new byte[4096];
-                int read;
-
-                while ((read = input.read(buffer)) != -1) {
-                    output.write(buffer, 0, read);
-                }
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-                return null;
-            }
+        try (InputStream input = messageReceiver.retrieveAttachment(pointer,
+                tmpFile,
+                ServiceConfig.MAX_ATTACHMENT_SIZE)) {
+            IOUtils.copyStreamToFile(input, outputFile);

         } finally {
             try {
                 Files.delete(tmpFile.toPath());
             } catch (IOException e) {
         } finally {
             try {
                 Files.delete(tmpFile.toPath());
             } catch (IOException e) {

-                System.err.println("Failed to delete received attachment temp file “" + tmpFile + "”: " + e.getMessage());
+                logger.warn("Failed to delete received attachment temp file “{}”, ignoring: {}",
+                        tmpFile,
+                        e.getMessage());

             }
         }
         return outputFile;
     }
 
             }
         }
         return outputFile;
     }
 

-    private InputStream retrieveAttachmentAsStream(SignalServiceAttachmentPointer pointer, File tmpFile) throws IOException, InvalidMessageException {
-        final SignalServiceMessageReceiver messageReceiver = getMessageReceiver();
-        return messageReceiver.retrieveAttachment(pointer, tmpFile, BaseConfig.MAX_ATTACHMENT_SIZE);
-    }
-
-    @Override
-    public boolean isRemote() {
-        return false;
+    private InputStream retrieveAttachmentAsStream(
+            SignalServiceAttachmentPointer pointer, File tmpFile
+    ) throws IOException, InvalidMessageException, MissingConfigurationException {
+        final SignalServiceMessageReceiver messageReceiver = getOrCreateMessageReceiver();
+        return messageReceiver.retrieveAttachment(pointer, tmpFile, ServiceConfig.MAX_ATTACHMENT_SIZE);

     }
 
     }
 

-    private void sendGroups() throws IOException, UntrustedIdentityException {
+    void sendGroups() throws IOException, UntrustedIdentityException {

         File groupsFile = IOUtils.createTempFile();
 
         try {
             try (OutputStream fos = new FileOutputStream(groupsFile)) {
                 DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(fos);
                 for (GroupInfo record : account.getGroupStore().getGroups()) {
         File groupsFile = IOUtils.createTempFile();
 
         try {
             try (OutputStream fos = new FileOutputStream(groupsFile)) {
                 DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(fos);
                 for (GroupInfo record : account.getGroupStore().getGroups()) {

-                    ThreadInfo info = account.getThreadStore().getThread(Base64.encodeBytes(record.groupId));
-                    out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name),
-                            new ArrayList<>(record.getMembers()), createGroupAvatarAttachment(record.groupId),
-                            record.members.contains(username), Optional.fromNullable(info != null ? info.messageExpirationTime : null),
-                            Optional.fromNullable(record.color), record.blocked, Optional.fromNullable(record.inboxPosition), record.archived));
+                    if (record instanceof GroupInfoV1) {
+                        GroupInfoV1 groupInfo = (GroupInfoV1) record;
+                        out.write(new DeviceGroup(groupInfo.getGroupId().serialize(),
+                                Optional.fromNullable(groupInfo.name),
+                                new ArrayList<>(groupInfo.getMembers()),
+                                createGroupAvatarAttachment(groupInfo.getGroupId()),
+                                groupInfo.isMember(account.getSelfAddress()),
+                                Optional.of(groupInfo.messageExpirationTime),
+                                Optional.fromNullable(groupInfo.color),
+                                groupInfo.blocked,
+                                Optional.fromNullable(groupInfo.inboxPosition),
+                                groupInfo.archived));
+                    }

                 }
             }
 
                 }
             }
 


@@ -1688,7 +2498,7 @@ public class Manager implements Signal {
             try {
                 Files.delete(groupsFile.toPath());
             } catch (IOException e) {
             try {
                 Files.delete(groupsFile.toPath());
             } catch (IOException e) {

-                System.err.println("Failed to delete groups temp file “" + groupsFile + "”: " + e.getMessage());
+                logger.warn("Failed to delete groups temp file “{}”, ignoring: {}", groupsFile, e.getMessage());

             }
         }
     }
             }
         }
     }


@@ -1701,38 +2511,39 @@ public class Manager implements Signal {
                 DeviceContactsOutputStream out = new DeviceContactsOutputStream(fos);
                 for (ContactInfo record : account.getContactStore().getContacts()) {
                     VerifiedMessage verifiedMessage = null;
                 DeviceContactsOutputStream out = new DeviceContactsOutputStream(fos);
                 for (ContactInfo record : account.getContactStore().getContacts()) {
                     VerifiedMessage verifiedMessage = null;

-                    ThreadInfo info = account.getThreadStore().getThread(record.number);
-                    if (getIdentities().containsKey(record.number)) {
-                        JsonIdentityKeyStore.Identity currentIdentity = null;
-                        for (JsonIdentityKeyStore.Identity id : getIdentities().get(record.number)) {
-                            if (currentIdentity == null || id.getDateAdded().after(currentIdentity.getDateAdded())) {
-                                currentIdentity = id;
-                            }
-                        }
-                        if (currentIdentity != null) {
-                            verifiedMessage = new VerifiedMessage(record.getAddress(), currentIdentity.getIdentityKey(), currentIdentity.getTrustLevel().toVerifiedState(), currentIdentity.getDateAdded().getTime());
-                        }
+                    IdentityInfo currentIdentity = account.getSignalProtocolStore().getIdentity(record.getAddress());
+                    if (currentIdentity != null) {
+                        verifiedMessage = new VerifiedMessage(record.getAddress(),
+                                currentIdentity.getIdentityKey(),
+                                currentIdentity.getTrustLevel().toVerifiedState(),
+                                currentIdentity.getDateAdded().getTime());

                     }
 
                     }
 

-                    ProfileKey profileKey = null;
-                    try {
-                        profileKey = record.profileKey == null ? null : new ProfileKey(Base64.decode(record.profileKey));
-                    } catch (InvalidInputException ignored) {
-                    }
-                    out.write(new DeviceContact(record.getAddress(), Optional.fromNullable(record.name),
-                            createContactAvatarAttachment(record.number), Optional.fromNullable(record.color),
-                            Optional.fromNullable(verifiedMessage), Optional.fromNullable(profileKey), record.blocked,
-                            Optional.fromNullable(info != null ? info.messageExpirationTime : null),
-                            Optional.fromNullable(record.inboxPosition), record.archived));
+                    ProfileKey profileKey = account.getProfileStore().getProfileKey(record.getAddress());
+                    out.write(new DeviceContact(record.getAddress(),
+                            Optional.fromNullable(record.name),
+                            createContactAvatarAttachment(record.number),
+                            Optional.fromNullable(record.color),
+                            Optional.fromNullable(verifiedMessage),
+                            Optional.fromNullable(profileKey),
+                            record.blocked,
+                            Optional.of(record.messageExpirationTime),
+                            Optional.fromNullable(record.inboxPosition),
+                            record.archived));

                 }
 
                 if (account.getProfileKey() != null) {
                     // Send our own profile key as well
                     out.write(new DeviceContact(account.getSelfAddress(),
                 }
 
                 if (account.getProfileKey() != null) {
                     // Send our own profile key as well
                     out.write(new DeviceContact(account.getSelfAddress(),

-                            Optional.absent(), Optional.absent(),
-                            Optional.absent(), Optional.absent(),
+                            Optional.absent(),
+                            Optional.absent(),
+                            Optional.absent(),
+                            Optional.absent(),

                             Optional.of(account.getProfileKey()),
                             Optional.of(account.getProfileKey()),

-                            false, Optional.absent(), Optional.absent(), false));
+                            false,
+                            Optional.absent(),
+                            Optional.absent(),
+                            false));

                 }
             }
 
                 }
             }
 


@@ -1751,12 +2562,12 @@ public class Manager implements Signal {
             try {
                 Files.delete(contactsFile.toPath());
             } catch (IOException e) {
             try {
                 Files.delete(contactsFile.toPath());
             } catch (IOException e) {

-                System.err.println("Failed to delete contacts temp file “" + contactsFile + "”: " + e.getMessage());
+                logger.warn("Failed to delete contacts temp file “{}”, ignoring: {}", contactsFile, e.getMessage());

             }
         }
     }
 
             }
         }
     }
 

-    private void sendBlockedList() throws IOException, UntrustedIdentityException {
+    void sendBlockedList() throws IOException, UntrustedIdentityException {

         List<SignalServiceAddress> addresses = new ArrayList<>();
         for (ContactInfo record : account.getContactStore().getContacts()) {
             if (record.blocked) {
         List<SignalServiceAddress> addresses = new ArrayList<>();
         for (ContactInfo record : account.getContactStore().getContacts()) {
             if (record.blocked) {


@@ -1765,15 +2576,20 @@ public class Manager implements Signal {
         }
         List<byte[]> groupIds = new ArrayList<>();
         for (GroupInfo record : account.getGroupStore().getGroups()) {
         }
         List<byte[]> groupIds = new ArrayList<>();
         for (GroupInfo record : account.getGroupStore().getGroups()) {

-            if (record.blocked) {
-                groupIds.add(record.groupId);
+            if (record.isBlocked()) {
+                groupIds.add(record.getGroupId().serialize());

             }
         }
         sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(addresses, groupIds)));
     }
 
             }
         }
         sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(addresses, groupIds)));
     }
 

-    private void sendVerifiedMessage(SignalServiceAddress destination, IdentityKey identityKey, TrustLevel trustLevel) throws IOException, UntrustedIdentityException {
-        VerifiedMessage verifiedMessage = new VerifiedMessage(destination, identityKey, trustLevel.toVerifiedState(), System.currentTimeMillis());
+    private void sendVerifiedMessage(
+            SignalServiceAddress destination, IdentityKey identityKey, TrustLevel trustLevel
+    ) throws IOException, UntrustedIdentityException {
+        VerifiedMessage verifiedMessage = new VerifiedMessage(destination,
+                identityKey,
+                trustLevel.toVerifiedState(),
+                System.currentTimeMillis());

         sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
     }
 
         sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
     }
 


@@ -1782,20 +2598,19 @@ public class Manager implements Signal {
     }
 
     public ContactInfo getContact(String number) {
     }
 
     public ContactInfo getContact(String number) {

-        return account.getContactStore().getContact(number);
+        return account.getContactStore().getContact(Utils.getSignalServiceAddressFromIdentifier(number));

     }
 
     }
 

-    public GroupInfo getGroup(byte[] groupId) {
+    public GroupInfo getGroup(GroupId groupId) {

         return account.getGroupStore().getGroup(groupId);
     }
 
         return account.getGroupStore().getGroup(groupId);
     }
 

-    public Map<String, List<JsonIdentityKeyStore.Identity>> getIdentities() {
+    public List<IdentityInfo> getIdentities() {

         return account.getSignalProtocolStore().getIdentities();
     }
 
         return account.getSignalProtocolStore().getIdentities();
     }
 

-    public Pair<String, List<JsonIdentityKeyStore.Identity>> getIdentities(String number) throws InvalidNumberException {
-        String canonicalizedNumber = Utils.canonicalizeNumber(number, username);
-        return new Pair<>(canonicalizedNumber, account.getSignalProtocolStore().getIdentities(canonicalizedNumber));
+    public List<IdentityInfo> getIdentities(String number) throws InvalidNumberException {
+        return account.getSignalProtocolStore().getIdentities(canonicalizeAndResolveSignalServiceAddress(number));

     }
 
     /**
     }
 
     /**


@@ -1804,19 +2619,21 @@ public class Manager implements Signal {
      * @param name        username of the identity
      * @param fingerprint Fingerprint
      */
      * @param name        username of the identity
      * @param fingerprint Fingerprint
      */

-    public boolean trustIdentityVerified(String name, byte[] fingerprint) {
-        List<JsonIdentityKeyStore.Identity> ids = account.getSignalProtocolStore().getIdentities(name);
+    public boolean trustIdentityVerified(String name, byte[] fingerprint) throws InvalidNumberException {
+        SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(name);
+        List<IdentityInfo> ids = account.getSignalProtocolStore().getIdentities(address);

         if (ids == null) {
             return false;
         }
         if (ids == null) {
             return false;
         }

-        for (JsonIdentityKeyStore.Identity id : ids) {
+        for (IdentityInfo id : ids) {

             if (!Arrays.equals(id.getIdentityKey().serialize(), fingerprint)) {
                 continue;
             }
 
             if (!Arrays.equals(id.getIdentityKey().serialize(), fingerprint)) {
                 continue;
             }
 

-            account.getSignalProtocolStore().saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+            account.getSignalProtocolStore()
+                    .setIdentityTrustLevel(address, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);

             try {
             try {

-                sendVerifiedMessage(new SignalServiceAddress(null, name), id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+                sendVerifiedMessage(address, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);

             } catch (IOException | UntrustedIdentityException e) {
                 e.printStackTrace();
             }
             } catch (IOException | UntrustedIdentityException e) {
                 e.printStackTrace();
             }


@@ -1832,19 +2649,21 @@ public class Manager implements Signal {
      * @param name         username of the identity
      * @param safetyNumber Safety number
      */
      * @param name         username of the identity
      * @param safetyNumber Safety number
      */

-    public boolean trustIdentityVerifiedSafetyNumber(String name, String safetyNumber) {
-        List<JsonIdentityKeyStore.Identity> ids = account.getSignalProtocolStore().getIdentities(name);
+    public boolean trustIdentityVerifiedSafetyNumber(String name, String safetyNumber) throws InvalidNumberException {
+        SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(name);
+        List<IdentityInfo> ids = account.getSignalProtocolStore().getIdentities(address);

         if (ids == null) {
             return false;
         }
         if (ids == null) {
             return false;
         }

-        for (JsonIdentityKeyStore.Identity id : ids) {
-            if (!safetyNumber.equals(computeSafetyNumber(name, id.getIdentityKey()))) {
+        for (IdentityInfo id : ids) {
+            if (!safetyNumber.equals(computeSafetyNumber(address, id.getIdentityKey()))) {

                 continue;
             }
 
                 continue;
             }
 

-            account.getSignalProtocolStore().saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+            account.getSignalProtocolStore()
+                    .setIdentityTrustLevel(address, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);

             try {
             try {

-                sendVerifiedMessage(new SignalServiceAddress(null, name), id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+                sendVerifiedMessage(address, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);

             } catch (IOException | UntrustedIdentityException e) {
                 e.printStackTrace();
             }
             } catch (IOException | UntrustedIdentityException e) {
                 e.printStackTrace();
             }


@@ -1860,15 +2679,17 @@ public class Manager implements Signal {
      * @param name username of the identity
      */
     public boolean trustIdentityAllKeys(String name) {
      * @param name username of the identity
      */
     public boolean trustIdentityAllKeys(String name) {

-        List<JsonIdentityKeyStore.Identity> ids = account.getSignalProtocolStore().getIdentities(name);
+        SignalServiceAddress address = resolveSignalServiceAddress(name);
+        List<IdentityInfo> ids = account.getSignalProtocolStore().getIdentities(address);

         if (ids == null) {
             return false;
         }
         if (ids == null) {
             return false;
         }

-        for (JsonIdentityKeyStore.Identity id : ids) {
+        for (IdentityInfo id : ids) {

             if (id.getTrustLevel() == TrustLevel.UNTRUSTED) {
             if (id.getTrustLevel() == TrustLevel.UNTRUSTED) {

-                account.getSignalProtocolStore().saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);
+                account.getSignalProtocolStore()
+                        .setIdentityTrustLevel(address, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);

                 try {
                 try {

-                    sendVerifiedMessage(new SignalServiceAddress(null, name), id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);
+                    sendVerifiedMessage(address, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);

                 } catch (IOException | UntrustedIdentityException e) {
                     e.printStackTrace();
                 }
                 } catch (IOException | UntrustedIdentityException e) {
                     e.printStackTrace();
                 }


@@ -1878,8 +2699,54 @@ public class Manager implements Signal {
         return true;
     }
 
         return true;
     }
 

-    public String computeSafetyNumber(String theirUsername, IdentityKey theirIdentityKey) {
-        return Utils.computeSafetyNumber(username, getIdentity(), theirUsername, theirIdentityKey);
+    public String computeSafetyNumber(
+            SignalServiceAddress theirAddress, IdentityKey theirIdentityKey
+    ) {
+        return Utils.computeSafetyNumber(ServiceConfig.capabilities.isUuid(),
+                account.getSelfAddress(),
+                getIdentityKeyPair().getPublicKey(),
+                theirAddress,
+                theirIdentityKey);
+    }
+
+    void saveAccount() {
+        account.save();
+    }
+
+    public SignalServiceAddress canonicalizeAndResolveSignalServiceAddress(String identifier) throws InvalidNumberException {
+        String canonicalizedNumber = UuidUtil.isUuid(identifier)
+                ? identifier
+                : PhoneNumberFormatter.formatNumber(identifier, account.getUsername());
+        return resolveSignalServiceAddress(canonicalizedNumber);
+    }
+
+    public SignalServiceAddress resolveSignalServiceAddress(String identifier) {
+        SignalServiceAddress address = Utils.getSignalServiceAddressFromIdentifier(identifier);
+
+        return resolveSignalServiceAddress(address);
+    }
+
+    public SignalServiceAddress resolveSignalServiceAddress(SignalServiceAddress address) {
+        if (address.matches(account.getSelfAddress())) {
+            return account.getSelfAddress();
+        }
+
+        return account.getRecipientStore().resolveServiceAddress(address);
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (messagePipe != null) {
+            messagePipe.shutdown();
+            messagePipe = null;
+        }
+
+        if (unidentifiedMessagePipe != null) {
+            unidentifiedMessagePipe.shutdown();
+            unidentifiedMessagePipe = null;
+        }
+
+        account.close();

     }
 
     public interface ReceiveMessageHandler {
     }
 
     public interface ReceiveMessageHandler {