]> nmode's Git Repositories - signal-cli/blobdiff - src/main/java/org/asamk/signal/manager/Manager.java
Extract lib module
[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
deleted file mode 100644 (file)
index 7d15b8a..0000000
+++ /dev/null
@@ -1,2041 +0,0 @@
-/*
-  Copyright (C) 2015-2020 AsamK and contributors
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.asamk.signal.manager;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.asamk.Signal;
-import org.asamk.signal.AttachmentInvalidException;
-import org.asamk.signal.GroupNotFoundException;
-import org.asamk.signal.NotAGroupMemberException;
-import org.asamk.signal.StickerPackInvalidException;
-import org.asamk.signal.TrustLevel;
-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.util.IOUtils;
-import org.asamk.signal.util.Util;
-import org.signal.libsignal.metadata.InvalidMetadataMessageException;
-import org.signal.libsignal.metadata.InvalidMetadataVersionException;
-import org.signal.libsignal.metadata.ProtocolDuplicateMessageException;
-import org.signal.libsignal.metadata.ProtocolInvalidKeyException;
-import org.signal.libsignal.metadata.ProtocolInvalidKeyIdException;
-import org.signal.libsignal.metadata.ProtocolInvalidMessageException;
-import org.signal.libsignal.metadata.ProtocolInvalidVersionException;
-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.certificate.InvalidCertificateException;
-import org.signal.zkgroup.InvalidInputException;
-import org.signal.zkgroup.VerificationFailedException;
-import org.signal.zkgroup.profiles.ClientZkProfileOperations;
-import org.signal.zkgroup.profiles.ProfileKey;
-import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.IdentityKeyPair;
-import org.whispersystems.libsignal.InvalidKeyException;
-import org.whispersystems.libsignal.InvalidMessageException;
-import org.whispersystems.libsignal.InvalidVersionException;
-import org.whispersystems.libsignal.ecc.Curve;
-import org.whispersystems.libsignal.ecc.ECKeyPair;
-import org.whispersystems.libsignal.ecc.ECPublicKey;
-import org.whispersystems.libsignal.state.PreKeyRecord;
-import org.whispersystems.libsignal.state.SignedPreKeyRecord;
-import org.whispersystems.libsignal.util.KeyHelper;
-import org.whispersystems.libsignal.util.Medium;
-import org.whispersystems.libsignal.util.Pair;
-import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
-import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
-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.UnidentifiedAccess;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
-import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
-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.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.DeviceContactsInputStream;
-import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsOutputStream;
-import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroup;
-import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsInputStream;
-import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsOutputStream;
-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.VerifiedMessage;
-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.EncapsulatedExceptions;
-import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException;
-import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
-import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
-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.push.SignalServiceProtos;
-import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;
-import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
-import org.whispersystems.signalservice.internal.util.Hex;
-import org.whispersystems.util.Base64;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URLEncoder;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Set;
-import java.util.UUID;
-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, Closeable {
-
-    private final SleepTimer timer = new UptimeSleepTimer();
-    private final SignalServiceConfiguration serviceConfiguration;
-    private final String userAgent;
-
-    private final SignalAccount account;
-    private final PathConfig pathConfig;
-    private SignalServiceAccountManager accountManager;
-    private SignalServiceMessagePipe messagePipe = null;
-    private SignalServiceMessagePipe unidentifiedMessagePipe = null;
-
-    public Manager(SignalAccount account, PathConfig pathConfig, SignalServiceConfiguration serviceConfiguration, String userAgent) {
-        this.account = account;
-        this.pathConfig = pathConfig;
-        this.serviceConfiguration = serviceConfiguration;
-        this.userAgent = userAgent;
-        this.accountManager = createSignalServiceAccountManager();
-
-        this.account.setResolver(this::resolveSignalServiceAddress);
-    }
-
-    public String getUsername() {
-        return account.getUsername();
-    }
-
-    public SignalServiceAddress getSelfAddress() {
-        return account.getSelfAddress();
-    }
-
-    private SignalServiceAccountManager createSignalServiceAccountManager() {
-        return new SignalServiceAccountManager(serviceConfiguration, account.getUuid(), account.getUsername(), account.getPassword(), account.getDeviceId(), userAgent, timer);
-    }
-
-    private IdentityKeyPair getIdentityKeyPair() {
-        return account.getSignalProtocolStore().getIdentityKeyPair();
-    }
-
-    public int getDeviceId() {
-        return account.getDeviceId();
-    }
-
-    private String getMessageCachePath() {
-        return pathConfig.getDataPath() + "/" + account.getUsername() + ".d/msg-cache";
-    }
-
-    private String getMessageCachePath(String sender) {
-        if (sender == null || sender.isEmpty()) {
-            return getMessageCachePath();
-        }
-
-        return getMessageCachePath() + "/" + sender.replace("/", "_");
-    }
-
-    private File getMessageCacheFile(String sender, long now, long timestamp) throws IOException {
-        String cachePath = getMessageCachePath(sender);
-        IOUtils.createPrivateDirectories(cachePath);
-        return new File(cachePath + "/" + now + "_" + timestamp);
-    }
-
-    public static Manager init(String username, String settingsPath, SignalServiceConfiguration serviceConfiguration, String userAgent) throws IOException {
-        PathConfig pathConfig = PathConfig.createDefault(settingsPath);
-
-        if (!SignalAccount.userExists(pathConfig.getDataPath(), username)) {
-            IdentityKeyPair identityKey = KeyHelper.generateIdentityKeyPair();
-            int registrationId = KeyHelper.generateRegistrationId(false);
-
-            ProfileKey profileKey = KeyUtils.createProfileKey();
-            SignalAccount account = SignalAccount.create(pathConfig.getDataPath(), username, identityKey, registrationId, profileKey);
-            account.save();
-
-            return new Manager(account, pathConfig, serviceConfiguration, userAgent);
-        }
-
-        SignalAccount account = SignalAccount.load(pathConfig.getDataPath(), username);
-
-        Manager m = new Manager(account, pathConfig, serviceConfiguration, userAgent);
-
-        m.migrateLegacyConfigs();
-
-        return m;
-    }
-
-    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(new SignalServiceAttachmentRemoteId(g.getAvatarId()));
-                if (!avatarFile.exists() && attachmentFile.exists()) {
-                    try {
-                        IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());
-                        Files.copy(attachmentFile.toPath(), avatarFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-                    } catch (Exception e) {
-                        // Ignore
-                    }
-                }
-            }
-            JsonGroupStore.groupsWithLegacyAvatarId.clear();
-            account.save();
-        }
-        if (account.getProfileKey() == null) {
-            // Old config file, creating new profile key
-            account.setProfileKey(KeyUtils.createProfileKey());
-            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();
-            }
-        }
-    }
-
-    public boolean isRegistered() {
-        return account.isRegistered();
-    }
-
-    public void register(boolean voiceVerification) throws IOException {
-        account.setPassword(KeyUtils.createPassword());
-
-        // Resetting UUID, because registering doesn't work otherwise
-        account.setUuid(null);
-        accountManager = createSignalServiceAccountManager();
-
-        if (voiceVerification) {
-            accountManager.requestVoiceVerificationCode(Locale.getDefault(), Optional.absent(), Optional.absent());
-        } else {
-            accountManager.requestSmsVerificationCode(false, Optional.absent(), Optional.absent());
-        }
-
-        account.setRegistered(false);
-        account.save();
-    }
-
-    public void updateAccountAttributes() throws IOException {
-        accountManager.setAccountAttributes(account.getSignalingKey(), account.getSignalProtocolStore().getLocalRegistrationId(), true, account.getRegistrationLockPin(), account.getRegistrationLock(), getSelfUnidentifiedAccessKey(), false, ServiceConfig.capabilities);
-    }
-
-    public void setProfileName(String name) throws IOException {
-        accountManager.setProfileName(account.getProfileKey(), name);
-    }
-
-    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 unregister() throws IOException {
-        // When setting an empty GCM id, the Signal-Server also sets the fetchesMessages property to false.
-        // If this is the master device, other users can't send messages to this number anymore.
-        // If this is a linked device, other users can still send messages, but this device doesn't receive them anymore.
-        accountManager.setGcmId(Optional.absent());
-
-        account.setRegistered(false);
-        account.save();
-    }
-
-    public List<DeviceInfo> getLinkedDevices() throws IOException {
-        List<DeviceInfo> devices = accountManager.getDevices();
-        account.setMultiDevice(devices.size() > 1);
-        account.save();
-        return devices;
-    }
-
-    public void removeLinkedDevices(int deviceId) throws IOException {
-        accountManager.removeDevice(deviceId);
-        List<DeviceInfo> devices = accountManager.getDevices();
-        account.setMultiDevice(devices.size() > 1);
-        account.save();
-    }
-
-    public void addDeviceLink(URI linkUri) throws IOException, InvalidKeyException {
-        Utils.DeviceLinkInfo info = Utils.parseDeviceLinkUri(linkUri);
-
-        addDevice(info.deviceIdentifier, info.deviceKey);
-    }
-
-    private void addDevice(String deviceIdentifier, ECPublicKey deviceKey) throws IOException, InvalidKeyException {
-        IdentityKeyPair identityKeyPair = getIdentityKeyPair();
-        String verificationCode = accountManager.getNewDeviceVerificationCode();
-
-        accountManager.addDevice(deviceIdentifier, deviceKey, identityKeyPair, Optional.of(account.getProfileKey().serialize()), verificationCode);
-        account.setMultiDevice(true);
-        account.save();
-    }
-
-    private List<PreKeyRecord> generatePreKeys() {
-        List<PreKeyRecord> records = new ArrayList<>(ServiceConfig.PREKEY_BATCH_SIZE);
-
-        final int offset = account.getPreKeyIdOffset();
-        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);
-
-            records.add(record);
-        }
-
-        account.addPreKeys(records);
-        account.save();
-
-        return records;
-    }
-
-    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);
-
-            account.addSignedPreKey(record);
-            account.save();
-
-            return record;
-        } catch (InvalidKeyException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    public void verifyAccount(String verificationCode, String pin) throws IOException {
-        verificationCode = verificationCode.replace("-", "");
-        account.setSignalingKey(KeyUtils.createSignalingKey());
-        // TODO make unrestricted unidentified access configurable
-        VerifyAccountResponse response = accountManager.verifyAccountWithCode(verificationCode, account.getSignalingKey(), account.getSignalProtocolStore().getLocalRegistrationId(), true, pin, null, getSelfUnidentifiedAccessKey(), false, ServiceConfig.capabilities);
-
-        UUID uuid = UuidUtil.parseOrNull(response.getUuid());
-        // TODO response.isStorageCapable()
-        //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
-        account.setRegistered(true);
-        account.setUuid(uuid);
-        account.setRegistrationLockPin(pin);
-        account.getSignalProtocolStore().saveIdentity(account.getSelfAddress(), getIdentityKeyPair().getPublicKey(), TrustLevel.TRUSTED_VERIFIED);
-
-        refreshPreKeys();
-        account.save();
-    }
-
-    public void setRegistrationLockPin(Optional<String> pin) throws IOException {
-        if (pin.isPresent()) {
-            account.setRegistrationLockPin(pin.get());
-            throw new RuntimeException("Not implemented anymore, will be replaced with KBS");
-        } else {
-            account.setRegistrationLockPin(null);
-            accountManager.removeRegistrationLockV1();
-        }
-        account.save();
-    }
-
-    void refreshPreKeys() throws IOException {
-        List<PreKeyRecord> oneTimePreKeys = generatePreKeys();
-        final IdentityKeyPair identityKeyPair = getIdentityKeyPair();
-        SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(identityKeyPair);
-
-        accountManager.setPreKeys(identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
-    }
-
-    private SignalServiceMessageReceiver getMessageReceiver() {
-        // TODO implement ZkGroup support
-        final ClientZkProfileOperations clientZkProfileOperations = null;
-        return new SignalServiceMessageReceiver(serviceConfiguration, account.getUuid(), account.getUsername(), account.getPassword(), account.getDeviceId(), account.getSignalingKey(), userAgent, null, timer, clientZkProfileOperations);
-    }
-
-    private SignalServiceMessageSender getMessageSender() {
-        // TODO implement ZkGroup support
-        final ClientZkProfileOperations clientZkProfileOperations = null;
-        final boolean attachmentsV3 = false;
-        return new SignalServiceMessageSender(serviceConfiguration, account.getUuid(), account.getUsername(), account.getPassword(),
-                account.getDeviceId(), account.getSignalProtocolStore(), userAgent, account.isMultiDevice(), attachmentsV3, Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.absent(), clientZkProfileOperations);
-    }
-
-    private SignalServiceProfile getRecipientProfile(SignalServiceAddress address, Optional<UnidentifiedAccess> unidentifiedAccess) throws IOException {
-        SignalServiceMessagePipe pipe = unidentifiedMessagePipe != null && unidentifiedAccess.isPresent() ? unidentifiedMessagePipe
-                : messagePipe;
-
-        if (pipe != null) {
-            try {
-                return pipe.getProfile(address, Optional.absent(), unidentifiedAccess, SignalServiceProfile.RequestType.PROFILE).getProfile();
-            } catch (IOException ignored) {
-            }
-        }
-
-        SignalServiceMessageReceiver receiver = getMessageReceiver();
-        try {
-            return receiver.retrieveProfile(address, Optional.absent(), unidentifiedAccess, SignalServiceProfile.RequestType.PROFILE).getProfile();
-        } catch (VerificationFailedException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException {
-        File file = getGroupAvatarFile(groupId);
-        if (!file.exists()) {
-            return Optional.absent();
-        }
-
-        return Optional.of(Utils.createAttachment(file));
-    }
-
-    private Optional<SignalServiceAttachmentStream> createContactAvatarAttachment(String number) throws IOException {
-        File file = getContactAvatarFile(number);
-        if (!file.exists()) {
-            return Optional.absent();
-        }
-
-        return Optional.of(Utils.createAttachment(file));
-    }
-
-    private GroupInfo getGroupForSending(byte[] groupId) throws GroupNotFoundException, NotAGroupMemberException {
-        GroupInfo g = account.getGroupStore().getGroup(groupId);
-        if (g == null) {
-            throw new GroupNotFoundException(groupId);
-        }
-        if (!g.isMember(account.getSelfAddress())) {
-            throw new NotAGroupMemberException(groupId, g.name);
-        }
-        return g;
-    }
-
-    public List<GroupInfo> getGroups() {
-        return account.getGroupStore().getGroups();
-    }
-
-    @Override
-    public long 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);
-        }
-
-        final GroupInfo g = getGroupForSending(groupId);
-
-        messageBuilder.withExpiration(g.messageExpirationTime);
-
-        return sendMessageLegacy(messageBuilder, g.getMembersWithout(account.getSelfAddress()));
-    }
-
-    public void sendGroupMessageReaction(String emoji, boolean remove, String targetAuthor,
-                                         long targetSentTimestamp, byte[] groupId)
-            throws IOException, EncapsulatedExceptions, AttachmentInvalidException, InvalidNumberException {
-        SignalServiceDataMessage.Reaction reaction = new SignalServiceDataMessage.Reaction(emoji, remove, canonicalizeAndResolveSignalServiceAddress(targetAuthor), targetSentTimestamp);
-        final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
-                .withReaction(reaction);
-        if (groupId != null) {
-            SignalServiceGroup group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.DELIVER)
-                    .withId(groupId)
-                    .build();
-            messageBuilder.asGroupMessage(group);
-        }
-        final GroupInfo g = getGroupForSending(groupId);
-        sendMessageLegacy(messageBuilder, g.getMembersWithout(account.getSelfAddress()));
-    }
-
-    public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions {
-        SignalServiceGroup group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.QUIT)
-                .withId(groupId)
-                .build();
-
-        SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
-                .asGroupMessage(group);
-
-        final GroupInfo g = getGroupForSending(groupId);
-        g.removeMember(account.getSelfAddress());
-        account.getGroupStore().updateGroup(g);
-
-        sendMessageLegacy(messageBuilder, g.getMembersWithout(account.getSelfAddress()));
-    }
-
-    private byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection<SignalServiceAddress> members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
-        GroupInfo g;
-        if (groupId == null) {
-            // Create new group
-            g = new GroupInfo(KeyUtils.createGroupId());
-            g.addMembers(Collections.singleton(account.getSelfAddress()));
-        } else {
-            g = getGroupForSending(groupId);
-        }
-
-        if (name != null) {
-            g.name = name;
-        }
-
-        if (members != null) {
-            final Set<String> newE164Members = new HashSet<>();
-            for (SignalServiceAddress member : members) {
-                if (g.isMember(member) || !member.getNumber().isPresent()) {
-                    continue;
-                }
-                newE164Members.add(member.getNumber().get());
-            }
-
-            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) {
-                    newE164Members.remove(contact.getNumber());
-                }
-                System.err.println("Failed to add members " + Util.join(", ", newE164Members) + " to group: Not registered on Signal");
-                System.err.println("Aborting…");
-                System.exit(1);
-            }
-
-            g.addMembers(members);
-        }
-
-        if (avatarFile != null) {
-            IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());
-            File aFile = getGroupAvatarFile(g.groupId);
-            Files.copy(Paths.get(avatarFile), aFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-        }
-
-        account.getGroupStore().updateGroup(g);
-
-        SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(g);
-
-        sendMessageLegacy(messageBuilder, g.getMembersWithout(account.getSelfAddress()));
-        return g.groupId;
-    }
-
-    private void sendUpdateGroupMessage(byte[] groupId, SignalServiceAddress recipient) throws IOException, EncapsulatedExceptions {
-        if (groupId == null) {
-            return;
-        }
-        GroupInfo g = getGroupForSending(groupId);
-
-        if (!g.isMember(recipient)) {
-            return;
-        }
-
-        SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(g);
-
-        // Send group message only to the recipient who requested it
-        sendMessageLegacy(messageBuilder, Collections.singleton(recipient));
-    }
-
-    private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfo g) {
-        SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
-                .withId(g.groupId)
-                .withName(g.name)
-                .withMembers(new ArrayList<>(g.getMembers()));
-
-        File aFile = getGroupAvatarFile(g.groupId);
-        if (aFile.exists()) {
-            try {
-                group.withAvatar(Utils.createAttachment(aFile));
-            } catch (IOException e) {
-                throw new AttachmentInvalidException(aFile.toString(), e);
-            }
-        }
-
-        return SignalServiceDataMessage.newBuilder()
-                .asGroupMessage(group.build())
-                .withExpiration(g.messageExpirationTime);
-    }
-
-    private void sendGroupInfoRequest(byte[] groupId, SignalServiceAddress recipient) throws IOException, EncapsulatedExceptions {
-        if (groupId == null) {
-            return;
-        }
-
-        SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.REQUEST_INFO)
-                .withId(groupId);
-
-        SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
-                .asGroupMessage(group.build());
-
-        // Send group info request message to the recipient who sent us a message with this groupId
-        sendMessageLegacy(messageBuilder, Collections.singleton(recipient));
-    }
-
-    private void sendReceipt(SignalServiceAddress remoteAddress, long messageId) throws IOException, UntrustedIdentityException {
-        SignalServiceReceiptMessage receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.DELIVERY,
-                Collections.singletonList(messageId),
-                System.currentTimeMillis());
-
-        getMessageSender().sendReceipt(remoteAddress, getAccessFor(remoteAddress), receiptMessage);
-    }
-
-    @Override
-    public long sendMessage(String message, List<String> attachments, String recipient)
-            throws EncapsulatedExceptions, AttachmentInvalidException, IOException, InvalidNumberException {
-        List<String> recipients = new ArrayList<>(1);
-        recipients.add(recipient);
-        return sendMessage(message, attachments, recipients);
-    }
-
-    @Override
-    public long sendMessage(String messageText, List<String> attachments,
-                            List<String> recipients)
-            throws IOException, EncapsulatedExceptions, AttachmentInvalidException, InvalidNumberException {
-        final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
-        if (attachments != null) {
-            List<SignalServiceAttachment> attachmentStreams = Utils.getSignalServiceAttachments(attachments);
-
-            // Upload attachments here, so we only upload once even for multiple recipients
-            SignalServiceMessageSender messageSender = getMessageSender();
-            List<SignalServiceAttachment> attachmentPointers = new ArrayList<>(attachmentStreams.size());
-            for (SignalServiceAttachment attachment : attachmentStreams) {
-                if (attachment.isStream()) {
-                    attachmentPointers.add(messageSender.uploadAttachment(attachment.asStream()));
-                } else if (attachment.isPointer()) {
-                    attachmentPointers.add(attachment.asPointer());
-                }
-            }
-
-            messageBuilder.withAttachments(attachmentPointers);
-        }
-        return sendMessageLegacy(messageBuilder, getSignalServiceAddresses(recipients));
-    }
-
-    public void sendMessageReaction(String emoji, boolean remove, String targetAuthor,
-                                    long targetSentTimestamp, List<String> recipients)
-            throws IOException, EncapsulatedExceptions, AttachmentInvalidException, InvalidNumberException {
-        SignalServiceDataMessage.Reaction reaction = new SignalServiceDataMessage.Reaction(emoji, remove, canonicalizeAndResolveSignalServiceAddress(targetAuthor), targetSentTimestamp);
-        final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
-                .withReaction(reaction);
-        sendMessageLegacy(messageBuilder, getSignalServiceAddresses(recipients));
-    }
-
-    @Override
-    public void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions, InvalidNumberException {
-        SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
-                .asEndSessionMessage();
-
-        final Collection<SignalServiceAddress> signalServiceAddresses = getSignalServiceAddresses(recipients);
-        try {
-            sendMessageLegacy(messageBuilder, signalServiceAddresses);
-        } catch (Exception e) {
-            for (SignalServiceAddress address : signalServiceAddresses) {
-                handleEndSession(address);
-            }
-            account.save();
-            throw e;
-        }
-    }
-
-    @Override
-    public String getContactName(String number) throws InvalidNumberException {
-        ContactInfo contact = account.getContactStore().getContact(canonicalizeAndResolveSignalServiceAddress(number));
-        if (contact == null) {
-            return "";
-        } else {
-            return contact.name;
-        }
-    }
-
-    @Override
-    public void setContactName(String number, String name) throws InvalidNumberException {
-        final SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(number);
-        ContactInfo contact = account.getContactStore().getContact(address);
-        if (contact == null) {
-            contact = new ContactInfo(address);
-            System.err.println("Add contact " + contact.number + " named " + name);
-        } else {
-            System.err.println("Updating contact " + contact.number + " name " + contact.name + " -> " + name);
-        }
-        contact.name = name;
-        account.getContactStore().updateContact(contact);
-        account.save();
-    }
-
-    @Override
-    public void setContactBlocked(String number, boolean blocked) throws InvalidNumberException {
-        setContactBlocked(canonicalizeAndResolveSignalServiceAddress(number), blocked);
-    }
-
-    private void setContactBlocked(SignalServiceAddress address, boolean blocked) {
-        ContactInfo contact = account.getContactStore().getContact(address);
-        if (contact == null) {
-            contact = new ContactInfo(address);
-            System.err.println("Adding and " + (blocked ? "blocking" : "unblocking") + " contact " + address.getNumber().orNull());
-        } else {
-            System.err.println((blocked ? "Blocking" : "Unblocking") + " contact " + address.getNumber().orNull());
-        }
-        contact.blocked = blocked;
-        account.getContactStore().updateContact(contact);
-        account.save();
-    }
-
-    @Override
-    public void setGroupBlocked(final byte[] groupId, final boolean blocked) throws GroupNotFoundException {
-        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();
-        }
-    }
-
-    @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;
-    }
-
-    @Override
-    public String getGroupName(byte[] groupId) {
-        GroupInfo group = getGroup(groupId);
-        if (group == null) {
-            return "";
-        } else {
-            return group.name;
-        }
-    }
-
-    @Override
-    public List<String> getGroupMembers(byte[] groupId) {
-        GroupInfo group = getGroup(groupId);
-        if (group == null) {
-            return Collections.emptyList();
-        } else {
-            return new ArrayList<>(group.getMembersE164());
-        }
-    }
-
-    @Override
-    public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, InvalidNumberException {
-        if (groupId.length == 0) {
-            groupId = null;
-        }
-        if (name.isEmpty()) {
-            name = null;
-        }
-        if (members.size() == 0) {
-            members = null;
-        }
-        if (avatar.isEmpty()) {
-            avatar = null;
-        }
-        return sendUpdateGroupMessage(groupId, name, members == null ? null : getSignalServiceAddresses(members), avatar);
-    }
-
-    /**
-     * Change the expiration timer for a contact
-     */
-    public void setExpirationTimer(SignalServiceAddress address, int messageExpirationTimer) {
-        ContactInfo c = account.getContactStore().getContact(address);
-        c.messageExpirationTime = messageExpirationTimer;
-        account.getContactStore().updateContact(c);
-    }
-
-    /**
-     * Change the expiration timer for a group
-     */
-    public void setExpirationTimer(byte[] groupId, int messageExpirationTimer) {
-        GroupInfo g = account.getGroupStore().getGroup(groupId);
-        g.messageExpirationTime = messageExpirationTimer;
-        account.getGroupStore().updateGroup(g);
-    }
-
-    /**
-     * 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(String path) throws IOException, StickerPackInvalidException {
-        SignalServiceStickerManifestUpload manifest = getSignalServiceStickerManifestUpload(path);
-
-        SignalServiceMessageSender messageSender = getMessageSender();
-
-        byte[] packKey = KeyUtils.createStickerUploadKey();
-        String packId = messageSender.uploadStickerManifest(manifest, packKey);
-
-        try {
-            return new URI("https", "signal.art", "/addstickers/", "pack_id=" + URLEncoder.encode(packId, "utf-8") + "&pack_key=" + URLEncoder.encode(Hex.toStringCondensed(packKey), "utf-8"))
-                    .toString();
-        } catch (URISyntaxException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    private SignalServiceStickerManifestUpload getSignalServiceStickerManifestUpload(final String path) throws IOException, StickerPackInvalidException {
-        ZipFile zip = null;
-        String rootPath = null;
-
-        final File file = new File(path);
-        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");
-        }
-
-        JsonStickerPack pack = parseStickerPack(rootPath, zip);
-
-        if (pack.stickers == null) {
-            throw new StickerPackInvalidException("Must set a 'stickers' field.");
-        }
-
-        if (pack.stickers.isEmpty()) {
-            throw new StickerPackInvalidException("Must include stickers.");
-        }
-
-        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);
-            }
-
-            StickerInfo stickerInfo = new StickerInfo(data.first(), data.second(), Optional.fromNullable(sticker.emoji).or(""));
-            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);
-            }
-
-            cover = new StickerInfo(data.first(), data.second(), Optional.fromNullable(pack.cover.emoji).or(""));
-        }
-
-        return new SignalServiceStickerManifestUpload(
-                pack.title,
-                pack.author,
-                cover,
-                stickers);
-    }
-
-    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 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);
-        } catch (UntrustedIdentityException e) {
-            e.printStackTrace();
-        }
-    }
-
-    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);
-        } catch (UntrustedIdentityException e) {
-            e.printStackTrace();
-        }
-    }
-
-    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);
-        } catch (UntrustedIdentityException e) {
-            e.printStackTrace();
-        }
-    }
-
-    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);
-        } catch (UntrustedIdentityException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private byte[] getSenderCertificate() {
-        // TODO support UUID capable sender certificates
-        // byte[] certificate = accountManager.getSenderCertificate();
-        byte[] certificate;
-        try {
-            certificate = accountManager.getSenderCertificateLegacy();
-        } catch (IOException e) {
-            System.err.println("Failed to get sender certificate: " + e);
-            return null;
-        }
-        // 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);
-        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) {
-            return null;
-        }
-    }
-
-    private byte[] getTargetUnidentifiedAccessKey(SignalServiceAddress recipient) {
-        ContactInfo contact = account.getContactStore().getContact(recipient);
-        if (contact == null || contact.profileKey == null) {
-            return null;
-        }
-        ProfileKey theirProfileKey;
-        try {
-            theirProfileKey = new ProfileKey(Base64.decode(contact.profileKey));
-        } catch (InvalidInputException | IOException e) {
-            throw new AssertionError(e);
-        }
-        SignalProfile targetProfile;
-        try {
-            targetProfile = decryptProfile(getRecipientProfile(recipient, Optional.absent()), theirProfileKey);
-        } catch (IOException e) {
-            System.err.println("Failed to get recipient profile: " + e);
-            return null;
-        }
-
-        if (targetProfile == null || targetProfile.getUnidentifiedAccess() == null) {
-            return null;
-        }
-
-        if (targetProfile.isUnrestrictedUnidentifiedAccess()) {
-            return KeyUtils.createUnrestrictedUnidentifiedAccess();
-        }
-
-        return UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey);
-    }
-
-    private Optional<UnidentifiedAccessPair> getAccessForSync() {
-        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) {
-        List<Optional<UnidentifiedAccessPair>> result = new ArrayList<>(recipients.size());
-        for (SignalServiceAddress recipient : recipients) {
-            result.add(getAccessFor(recipient));
-        }
-        return result;
-    }
-
-    private Optional<UnidentifiedAccessPair> getAccessFor(SignalServiceAddress recipient) {
-        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 Optional<UnidentifiedAccess> getUnidentifiedAccess(SignalServiceAddress recipient) {
-        Optional<UnidentifiedAccessPair> unidentifiedAccess = getAccessFor(recipient);
-
-        if (unidentifiedAccess.isPresent()) {
-            return unidentifiedAccess.get().getTargetUnidentifiedAccess();
-        }
-
-        return Optional.absent();
-    }
-
-    private void sendSyncMessage(SignalServiceSyncMessage message)
-            throws IOException, UntrustedIdentityException {
-        SignalServiceMessageSender messageSender = getMessageSender();
-        try {
-            messageSender.sendMessage(message, getAccessForSync());
-        } catch (UntrustedIdentityException e) {
-            account.getSignalProtocolStore().saveIdentity(resolveSignalServiceAddress(e.getIdentifier()), e.getIdentityKey(), TrustLevel.UNTRUSTED);
-            throw e;
-        }
-    }
-
-    /**
-     * This method throws an EncapsulatedExceptions exception instead of returning a list of SendMessageResult.
-     */
-    private long sendMessageLegacy(SignalServiceDataMessage.Builder messageBuilder, Collection<SignalServiceAddress> recipients)
-            throws EncapsulatedExceptions, IOException {
-        final long timestamp = System.currentTimeMillis();
-        messageBuilder.withTimestamp(timestamp);
-        List<SendMessageResult> results = sendMessage(messageBuilder, recipients);
-
-        List<UntrustedIdentityException> untrustedIdentities = new LinkedList<>();
-        List<UnregisteredUserException> unregisteredUsers = new LinkedList<>();
-        List<NetworkFailureException> networkExceptions = new LinkedList<>();
-
-        for (SendMessageResult result : results) {
-            if (result.isUnregisteredFailure()) {
-                unregisteredUsers.add(new UnregisteredUserException(result.getAddress().getLegacyIdentifier(), null));
-            } else if (result.isNetworkFailure()) {
-                networkExceptions.add(new NetworkFailureException(result.getAddress().getLegacyIdentifier(), null));
-            } else if (result.getIdentityFailure() != null) {
-                untrustedIdentities.add(new UntrustedIdentityException("Untrusted", result.getAddress().getLegacyIdentifier(), result.getIdentityFailure().getIdentityKey()));
-            }
-        }
-        if (!untrustedIdentities.isEmpty() || !unregisteredUsers.isEmpty() || !networkExceptions.isEmpty()) {
-            throw new EncapsulatedExceptions(untrustedIdentities, unregisteredUsers, networkExceptions);
-        }
-        return timestamp;
-    }
-
-    private Collection<SignalServiceAddress> getSignalServiceAddresses(Collection<String> numbers) throws InvalidNumberException {
-        final Set<SignalServiceAddress> signalServiceAddresses = new HashSet<>(numbers.size());
-
-        for (String number : numbers) {
-            signalServiceAddresses.add(canonicalizeAndResolveSignalServiceAddress(number));
-        }
-        return signalServiceAddresses;
-    }
-
-    private List<SendMessageResult> sendMessage(SignalServiceDataMessage.Builder messageBuilder, Collection<SignalServiceAddress> recipients)
-            throws IOException {
-        if (messagePipe == null) {
-            messagePipe = getMessageReceiver().createMessagePipe();
-        }
-        if (unidentifiedMessagePipe == null) {
-            unidentifiedMessagePipe = getMessageReceiver().createUnidentifiedMessagePipe();
-        }
-        SignalServiceDataMessage message = null;
-        try {
-            SignalServiceMessageSender messageSender = getMessageSender();
-
-            message = messageBuilder.build();
-            if (message.getGroupContext().isPresent()) {
-                try {
-                    final boolean isRecipientUpdate = false;
-                    List<SendMessageResult> result = messageSender.sendMessage(new ArrayList<>(recipients), getAccessFor(recipients), isRecipientUpdate, message);
-                    for (SendMessageResult r : result) {
-                        if (r.getIdentityFailure() != null) {
-                            account.getSignalProtocolStore().saveIdentity(r.getAddress(), r.getIdentityFailure().getIdentityKey(), TrustLevel.UNTRUSTED);
-                        }
-                    }
-                    return result;
-                } catch (UntrustedIdentityException e) {
-                    account.getSignalProtocolStore().saveIdentity(resolveSignalServiceAddress(e.getIdentifier()), e.getIdentityKey(), TrustLevel.UNTRUSTED);
-                    return Collections.emptyList();
-                }
-            } else if (recipients.size() == 1 && recipients.contains(account.getSelfAddress())) {
-                SignalServiceAddress recipient = account.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<>(recipients.size());
-                try {
-                    messageSender.sendMessage(syncMessage, unidentifiedAccess);
-                } catch (UntrustedIdentityException e) {
-                    account.getSignalProtocolStore().saveIdentity(resolveSignalServiceAddress(e.getIdentifier()), e.getIdentityKey(), TrustLevel.UNTRUSTED);
-                    results.add(SendMessageResult.identityFailure(recipient, e.getIdentityKey()));
-                }
-                return results;
-            } else {
-                // Send to all individually, so sync messages are sent correctly
-                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);
-                        messageBuilder.withProfileKey(null);
-                    }
-                    message = messageBuilder.build();
-                    try {
-                        SendMessageResult result = messageSender.sendMessage(address, getAccessFor(address), message);
-                        results.add(result);
-                    } catch (UntrustedIdentityException e) {
-                        account.getSignalProtocolStore().saveIdentity(resolveSignalServiceAddress(e.getIdentifier()), e.getIdentityKey(), TrustLevel.UNTRUSTED);
-                        results.add(SendMessageResult.identityFailure(address, e.getIdentityKey()));
-                    }
-                }
-                return results;
-            }
-        } finally {
-            if (message != null && message.isEndSession()) {
-                for (SignalServiceAddress recipient : recipients) {
-                    handleEndSession(recipient);
-                }
-            }
-            account.save();
-        }
-    }
-
-    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(), Utils.getCertificateValidator());
-        try {
-            return cipher.decrypt(envelope);
-        } catch (ProtocolUntrustedIdentityException 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(SignalServiceAddress source) {
-        account.getSignalProtocolStore().deleteAllSessions(source);
-    }
-
-    private void handleSignalServiceDataMessage(SignalServiceDataMessage message, boolean isSync, SignalServiceAddress source, SignalServiceAddress destination, boolean ignoreAttachments) {
-        if (message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()) {
-            SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();
-            GroupInfo group = account.getGroupStore().getGroup(groupInfo.getGroupId());
-            switch (groupInfo.getType()) {
-                case UPDATE:
-                    if (group == null) {
-                        group = new GroupInfo(groupInfo.getGroupId());
-                    }
-
-                    if (groupInfo.getAvatar().isPresent()) {
-                        SignalServiceAttachment avatar = groupInfo.getAvatar().get();
-                        if (avatar.isPointer()) {
-                            try {
-                                retrieveGroupAvatarAttachment(avatar.asPointer(), group.groupId);
-                            } catch (IOException | InvalidMessageException | MissingConfigurationException e) {
-                                System.err.println("Failed to retrieve group avatar (" + avatar.asPointer().getRemoteId() + "): " + e.getMessage());
-                            }
-                        }
-                    }
-
-                    if (groupInfo.getName().isPresent()) {
-                        group.name = groupInfo.getName().get();
-                    }
-
-                    if (groupInfo.getMembers().isPresent()) {
-                        group.addMembers(groupInfo.getMembers().get()
-                                .stream()
-                                .map(this::resolveSignalServiceAddress)
-                                .collect(Collectors.toSet()));
-                    }
-
-                    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) {
-                        group.removeMember(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
-                        }
-                    }
-                    break;
-            }
-        }
-        final SignalServiceAddress conversationPartnerAddress = isSync ? destination : source;
-        if (message.isEndSession()) {
-            handleEndSession(conversationPartnerAddress);
-        }
-        if (message.isExpirationUpdate() || message.getBody().isPresent()) {
-            if (message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()) {
-                SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();
-                GroupInfo group = account.getGroupStore().getGroup(groupInfo.getGroupId());
-                if (group == null) {
-                    group = new GroupInfo(groupInfo.getGroupId());
-                }
-                if (group.messageExpirationTime != message.getExpiresInSeconds()) {
-                    group.messageExpirationTime = message.getExpiresInSeconds();
-                    account.getGroupStore().updateGroup(group);
-                }
-            } else {
-                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) {
-            for (SignalServiceAttachment attachment : message.getAttachments().get()) {
-                if (attachment.isPointer()) {
-                    try {
-                        retrieveAttachment(attachment.asPointer());
-                    } catch (IOException | InvalidMessageException | MissingConfigurationException e) {
-                        System.err.println("Failed to retrieve attachment (" + attachment.asPointer().getRemoteId() + "): " + e.getMessage());
-                    }
-                }
-            }
-        }
-        if (message.getProfileKey().isPresent() && message.getProfileKey().get().length == 32) {
-            if (source.matches(account.getSelfAddress())) {
-                try {
-                    this.account.setProfileKey(new ProfileKey(message.getProfileKey().get()));
-                } catch (InvalidInputException ignored) {
-                }
-                ContactInfo contact = account.getContactStore().getContact(source);
-                if (contact != null) {
-                    contact.profileKey = Base64.encodeBytes(message.getProfileKey().get());
-                    account.getContactStore().updateContact(contact);
-                }
-            } else {
-                ContactInfo contact = account.getContactStore().getContact(source);
-                if (contact == null) {
-                    contact = new ContactInfo(source);
-                }
-                contact.profileKey = Base64.encodeBytes(message.getProfileKey().get());
-                account.getContactStore().updateContact(contact);
-            }
-        }
-        if (message.getPreviews().isPresent()) {
-            final List<SignalServiceDataMessage.Preview> previews = message.getPreviews().get();
-            for (SignalServiceDataMessage.Preview preview : previews) {
-                if (preview.getImage().isPresent() && preview.getImage().get().isPointer()) {
-                    SignalServiceAttachmentPointer attachment = preview.getImage().get().asPointer();
-                    try {
-                        retrieveAttachment(attachment);
-                    } catch (IOException | InvalidMessageException | MissingConfigurationException e) {
-                        System.err.println("Failed to retrieve attachment (" + attachment.getRemoteId() + "): " + e.getMessage());
-                    }
-                }
-            }
-        }
-    }
-
-    private void retryFailedReceivedMessages(ReceiveMessageHandler handler, boolean ignoreAttachments) {
-        final File cachePath = new File(getMessageCachePath());
-        if (!cachePath.exists()) {
-            return;
-        }
-        for (final File dir : Objects.requireNonNull(cachePath.listFiles())) {
-            if (!dir.isDirectory()) {
-                retryFailedReceivedMessage(handler, ignoreAttachments, dir);
-                continue;
-            }
-
-            for (final File fileEntry : Objects.requireNonNull(dir.listFiles())) {
-                if (!fileEntry.isFile()) {
-                    continue;
-                }
-                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 = Utils.loadEnvelope(fileEntry);
-            if (envelope == null) {
-                return;
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-            return;
-        }
-        SignalServiceContent content = null;
-        if (!envelope.isReceipt()) {
-            try {
-                content = decryptMessage(envelope);
-            } catch (Exception e) {
-                return;
-            }
-            handleMessage(envelope, content, ignoreAttachments);
-        }
-        account.save();
-        handler.handleMessage(envelope, content, null);
-        try {
-            Files.delete(fileEntry.toPath());
-        } catch (IOException e) {
-            System.err.println("Failed to delete cached message file “" + fileEntry + "”: " + e.getMessage());
-        }
-    }
-
-    public void receiveMessages(long timeout, TimeUnit unit, boolean returnOnTimeout, boolean ignoreAttachments, ReceiveMessageHandler handler) throws IOException {
-        retryFailedReceivedMessages(handler, ignoreAttachments);
-        final SignalServiceMessageReceiver messageReceiver = getMessageReceiver();
-
-        if (messagePipe == null) {
-            messagePipe = messageReceiver.createMessagePipe();
-        }
-
-        while (true) {
-            SignalServiceEnvelope envelope;
-            SignalServiceContent content = null;
-            Exception exception = null;
-            final long now = new Date().getTime();
-            try {
-                envelope = messagePipe.read(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());
-                        Utils.storeEnvelope(envelope1, cacheFile);
-                    } catch (IOException e) {
-                        System.err.println("Failed to store encrypted message in disk cache, ignoring: " + e.getMessage());
-                    }
-                });
-            } 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 org.whispersystems.libsignal.UntrustedIdentityException)) {
-                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());
-                }
-            }
-        }
-    }
-
-    private boolean isMessageBlocked(SignalServiceEnvelope envelope, SignalServiceContent content) {
-        SignalServiceAddress source;
-        if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
-            source = envelope.getSourceAddress();
-        } else if (content != null) {
-            source = content.getSender();
-        } else {
-            return false;
-        }
-        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 (message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()) {
-                SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();
-                GroupInfo group = getGroup(groupInfo.getGroupId());
-                if (groupInfo.getType() == SignalServiceGroup.Type.DELIVER && group != null && group.blocked) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, boolean ignoreAttachments) {
-        if (content != null) {
-            SignalServiceAddress sender;
-            if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
-                sender = envelope.getSourceAddress();
-            } else {
-                sender = content.getSender();
-            }
-            if (content.getDataMessage().isPresent()) {
-                SignalServiceDataMessage message = content.getDataMessage().get();
-
-                if (content.isNeedsReceipt()) {
-                    try {
-                        sendReceipt(sender, message.getTimestamp());
-                    } catch (IOException | UntrustedIdentityException | IllegalArgumentException e) {
-                        e.printStackTrace();
-                    }
-                }
-
-                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();
-                    handleSignalServiceDataMessage(message.getMessage(), true, sender, message.getDestination().orNull(), ignoreAttachments);
-                }
-                if (syncMessage.getRequest().isPresent()) {
-                    RequestMessage rm = syncMessage.getRequest().get();
-                    if (rm.isContactsRequest()) {
-                        try {
-                            sendContacts();
-                        } catch (UntrustedIdentityException | IOException | IllegalArgumentException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    if (rm.isGroupsRequest()) {
-                        try {
-                            sendGroups();
-                        } catch (UntrustedIdentityException | IOException | IllegalArgumentException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    if (rm.isBlockedListRequest()) {
-                        try {
-                            sendBlockedList();
-                        } catch (UntrustedIdentityException | IOException | IllegalArgumentException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    // TODO Handle rm.isConfigurationRequest();
-                }
-                if (syncMessage.getGroups().isPresent()) {
-                    File tmpFile = null;
-                    try {
-                        tmpFile = IOUtils.createTempFile();
-                        try (InputStream attachmentAsStream = retrieveAttachmentAsStream(syncMessage.getGroups().get().asPointer(), tmpFile)) {
-                            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()
-                                        .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(Collections.singleton(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);
-                                }
-                                syncGroup.inboxPosition = g.getInboxPosition().orNull();
-                                syncGroup.archived = g.isArchived();
-                                account.getGroupStore().updateGroup(syncGroup);
-                            }
-                        }
-                    } catch (Exception 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());
-                            }
-                        }
-                    }
-                }
-                if (syncMessage.getBlockedList().isPresent()) {
-                    final BlockedListMessage blockedListMessage = syncMessage.getBlockedList().get();
-                    for (SignalServiceAddress address : blockedListMessage.getAddresses()) {
-                        setContactBlocked(resolveSignalServiceAddress(address), true);
-                    }
-                    for (byte[] groupId : blockedListMessage.getGroupIds()) {
-                        try {
-                            setGroupBlocked(groupId, true);
-                        } catch (GroupNotFoundException e) {
-                            System.err.println("BlockedListMessage contained groupID that was not found in GroupStore: " + Base64.encodeBytes(groupId));
-                        }
-                    }
-                }
-                if (syncMessage.getContacts().isPresent()) {
-                    File tmpFile = null;
-                    try {
-                        tmpFile = IOUtils.createTempFile();
-                        final ContactsMessage contactsMessage = syncMessage.getContacts().get();
-                        try (InputStream attachmentAsStream = retrieveAttachmentAsStream(contactsMessage.getContactsStream().asPointer(), tmpFile)) {
-                            DeviceContactsInputStream s = new DeviceContactsInputStream(attachmentAsStream);
-                            if (contactsMessage.isComplete()) {
-                                account.getContactStore().clear();
-                            }
-                            DeviceContact c;
-                            while ((c = s.read()) != null) {
-                                if (c.getAddress().matches(account.getSelfAddress()) && c.getProfileKey().isPresent()) {
-                                    account.setProfileKey(c.getProfileKey().get());
-                                }
-                                final SignalServiceAddress address = resolveSignalServiceAddress(c.getAddress());
-                                ContactInfo contact = account.getContactStore().getContact(address);
-                                if (contact == null) {
-                                    contact = new ContactInfo(address);
-                                }
-                                if (c.getName().isPresent()) {
-                                    contact.name = c.getName().get();
-                                }
-                                if (c.getColor().isPresent()) {
-                                    contact.color = c.getColor().get();
-                                }
-                                if (c.getProfileKey().isPresent()) {
-                                    contact.profileKey = Base64.encodeBytes(c.getProfileKey().get().serialize());
-                                }
-                                if (c.getVerified().isPresent()) {
-                                    final VerifiedMessage verifiedMessage = c.getVerified().get();
-                                    account.getSignalProtocolStore().setIdentityTrustLevel(verifiedMessage.getDestination(), verifiedMessage.getIdentityKey(), TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
-                                }
-                                if (c.getExpirationTimer().isPresent()) {
-                                    contact.messageExpirationTime = c.getExpirationTimer().get();
-                                }
-                                contact.blocked = c.isBlocked();
-                                contact.inboxPosition = c.getInboxPosition().orNull();
-                                contact.archived = c.isArchived();
-                                account.getContactStore().updateContact(contact);
-
-                                if (c.getAvatar().isPresent()) {
-                                    retrieveContactAvatarAttachment(c.getAvatar().get(), contact.number);
-                                }
-                            }
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    } finally {
-                        if (tmpFile != null) {
-                            try {
-                                Files.delete(tmpFile.toPath());
-                            } catch (IOException e) {
-                                System.err.println("Failed to delete received contacts temp file “" + tmpFile + "”: " + e.getMessage());
-                            }
-                        }
-                    }
-                }
-                if (syncMessage.getVerified().isPresent()) {
-                    final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();
-                    account.getSignalProtocolStore().setIdentityTrustLevel(resolveSignalServiceAddress(verifiedMessage.getDestination()), verifiedMessage.getIdentityKey(), TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
-                }
-                if (syncMessage.getConfiguration().isPresent()) {
-                    // TODO
-                }
-            }
-        }
-    }
-
-    private File getContactAvatarFile(String number) {
-        return new File(pathConfig.getAvatarsPath(), "contact-" + number);
-    }
-
-    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();
-            return Utils.retrieveAttachment(stream, getContactAvatarFile(number));
-        }
-    }
-
-    private File getGroupAvatarFile(byte[] groupId) {
-        return new File(pathConfig.getAvatarsPath(), "group-" + Base64.encodeBytes(groupId).replace("/", "_"));
-    }
-
-    private File retrieveGroupAvatarAttachment(SignalServiceAttachment attachment, byte[] 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();
-            return Utils.retrieveAttachment(stream, getGroupAvatarFile(groupId));
-        }
-    }
-
-    public File getAttachmentFile(SignalServiceAttachmentRemoteId attachmentId) {
-        return new File(pathConfig.getAttachmentsPath(), attachmentId.toString());
-    }
-
-    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, MissingConfigurationException {
-        if (storePreview && pointer.getPreview().isPresent()) {
-            File previewFile = new File(outputFile + ".preview");
-            try (OutputStream output = new FileOutputStream(previewFile)) {
-                byte[] preview = pointer.getPreview().get();
-                output.write(preview, 0, preview.length);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-                return null;
-            }
-        }
-
-        final SignalServiceMessageReceiver messageReceiver = getMessageReceiver();
-
-        File tmpFile = IOUtils.createTempFile();
-        try (InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile, ServiceConfig.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;
-            }
-        } finally {
-            try {
-                Files.delete(tmpFile.toPath());
-            } catch (IOException e) {
-                System.err.println("Failed to delete received attachment temp file “" + tmpFile + "”: " + e.getMessage());
-            }
-        }
-        return outputFile;
-    }
-
-    private InputStream retrieveAttachmentAsStream(SignalServiceAttachmentPointer pointer, File tmpFile) throws IOException, InvalidMessageException, MissingConfigurationException {
-        final SignalServiceMessageReceiver messageReceiver = getMessageReceiver();
-        return messageReceiver.retrieveAttachment(pointer, tmpFile, ServiceConfig.MAX_ATTACHMENT_SIZE);
-    }
-
-    @Override
-    public boolean isRemote() {
-        return false;
-    }
-
-    @Override
-    public String getObjectPath() {
-        return null;
-    }
-
-    private 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()) {
-                    out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name),
-                            new ArrayList<>(record.getMembers()), createGroupAvatarAttachment(record.groupId),
-                            record.isMember(account.getSelfAddress()), Optional.of(record.messageExpirationTime),
-                            Optional.fromNullable(record.color), record.blocked, Optional.fromNullable(record.inboxPosition), record.archived));
-                }
-            }
-
-            if (groupsFile.exists() && groupsFile.length() > 0) {
-                try (FileInputStream groupsFileStream = new FileInputStream(groupsFile)) {
-                    SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
-                            .withStream(groupsFileStream)
-                            .withContentType("application/octet-stream")
-                            .withLength(groupsFile.length())
-                            .build();
-
-                    sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
-                }
-            }
-        } finally {
-            try {
-                Files.delete(groupsFile.toPath());
-            } catch (IOException e) {
-                System.err.println("Failed to delete groups temp file “" + groupsFile + "”: " + e.getMessage());
-            }
-        }
-    }
-
-    public void sendContacts() throws IOException, UntrustedIdentityException {
-        File contactsFile = IOUtils.createTempFile();
-
-        try {
-            try (OutputStream fos = new FileOutputStream(contactsFile)) {
-                DeviceContactsOutputStream out = new DeviceContactsOutputStream(fos);
-                for (ContactInfo record : account.getContactStore().getContacts()) {
-                    VerifiedMessage verifiedMessage = null;
-                    JsonIdentityKeyStore.Identity 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.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(),
-                            Optional.absent(), Optional.absent(),
-                            Optional.absent(), Optional.absent(),
-                            Optional.of(account.getProfileKey()),
-                            false, Optional.absent(), Optional.absent(), false));
-                }
-            }
-
-            if (contactsFile.exists() && contactsFile.length() > 0) {
-                try (FileInputStream contactsFileStream = new FileInputStream(contactsFile)) {
-                    SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
-                            .withStream(contactsFileStream)
-                            .withContentType("application/octet-stream")
-                            .withLength(contactsFile.length())
-                            .build();
-
-                    sendSyncMessage(SignalServiceSyncMessage.forContacts(new ContactsMessage(attachmentStream, true)));
-                }
-            }
-        } finally {
-            try {
-                Files.delete(contactsFile.toPath());
-            } catch (IOException e) {
-                System.err.println("Failed to delete contacts temp file “" + contactsFile + "”: " + e.getMessage());
-            }
-        }
-    }
-
-    private void sendBlockedList() throws IOException, UntrustedIdentityException {
-        List<SignalServiceAddress> addresses = new ArrayList<>();
-        for (ContactInfo record : account.getContactStore().getContacts()) {
-            if (record.blocked) {
-                addresses.add(record.getAddress());
-            }
-        }
-        List<byte[]> groupIds = new ArrayList<>();
-        for (GroupInfo record : account.getGroupStore().getGroups()) {
-            if (record.blocked) {
-                groupIds.add(record.groupId);
-            }
-        }
-        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());
-        sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
-    }
-
-    public List<ContactInfo> getContacts() {
-        return account.getContactStore().getContacts();
-    }
-
-    public ContactInfo getContact(String number) {
-        return account.getContactStore().getContact(Util.getSignalServiceAddressFromIdentifier(number));
-    }
-
-    public GroupInfo getGroup(byte[] groupId) {
-        return account.getGroupStore().getGroup(groupId);
-    }
-
-    public List<JsonIdentityKeyStore.Identity> getIdentities() {
-        return account.getSignalProtocolStore().getIdentities();
-    }
-
-    public List<JsonIdentityKeyStore.Identity> getIdentities(String number) throws InvalidNumberException {
-        return account.getSignalProtocolStore().getIdentities(canonicalizeAndResolveSignalServiceAddress(number));
-    }
-
-    /**
-     * Trust this the identity with this fingerprint
-     *
-     * @param name        username of the identity
-     * @param fingerprint Fingerprint
-     */
-    public boolean trustIdentityVerified(String name, byte[] fingerprint) throws InvalidNumberException {
-        SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(name);
-        List<JsonIdentityKeyStore.Identity> ids = account.getSignalProtocolStore().getIdentities(address);
-        if (ids == null) {
-            return false;
-        }
-        for (JsonIdentityKeyStore.Identity id : ids) {
-            if (!Arrays.equals(id.getIdentityKey().serialize(), fingerprint)) {
-                continue;
-            }
-
-            account.getSignalProtocolStore().setIdentityTrustLevel(address, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
-            try {
-                sendVerifiedMessage(address, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
-            } catch (IOException | UntrustedIdentityException e) {
-                e.printStackTrace();
-            }
-            account.save();
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Trust this the identity with this safety number
-     *
-     * @param name         username of the identity
-     * @param safetyNumber Safety number
-     */
-    public boolean trustIdentityVerifiedSafetyNumber(String name, String safetyNumber) throws InvalidNumberException {
-        SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(name);
-        List<JsonIdentityKeyStore.Identity> ids = account.getSignalProtocolStore().getIdentities(address);
-        if (ids == null) {
-            return false;
-        }
-        for (JsonIdentityKeyStore.Identity id : ids) {
-            if (!safetyNumber.equals(computeSafetyNumber(address, id.getIdentityKey()))) {
-                continue;
-            }
-
-            account.getSignalProtocolStore().setIdentityTrustLevel(address, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
-            try {
-                sendVerifiedMessage(address, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
-            } catch (IOException | UntrustedIdentityException e) {
-                e.printStackTrace();
-            }
-            account.save();
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Trust all keys of this identity without verification
-     *
-     * @param name username of the identity
-     */
-    public boolean trustIdentityAllKeys(String name) {
-        SignalServiceAddress address = resolveSignalServiceAddress(name);
-        List<JsonIdentityKeyStore.Identity> ids = account.getSignalProtocolStore().getIdentities(address);
-        if (ids == null) {
-            return false;
-        }
-        for (JsonIdentityKeyStore.Identity id : ids) {
-            if (id.getTrustLevel() == TrustLevel.UNTRUSTED) {
-                account.getSignalProtocolStore().setIdentityTrustLevel(address, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);
-                try {
-                    sendVerifiedMessage(address, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);
-                } catch (IOException | UntrustedIdentityException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        account.save();
-        return true;
-    }
-
-    public String computeSafetyNumber(SignalServiceAddress theirAddress, IdentityKey theirIdentityKey) {
-        return Utils.computeSafetyNumber(account.getSelfAddress(), getIdentityKeyPair().getPublicKey(), theirAddress, theirIdentityKey);
-    }
-
-    void saveAccount() {
-        account.save();
-    }
-
-    public SignalServiceAddress canonicalizeAndResolveSignalServiceAddress(String identifier) throws InvalidNumberException {
-        String canonicalizedNumber = UuidUtil.isUuid(identifier) ? identifier : Util.canonicalizeNumber(identifier, account.getUsername());
-        return resolveSignalServiceAddress(canonicalizedNumber);
-    }
-
-    public SignalServiceAddress resolveSignalServiceAddress(String identifier) {
-        SignalServiceAddress address = Util.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 {
-
-        void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent decryptedContent, Throwable e);
-    }
-}