Extract util methods to separate classes

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

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index 6bd8c65716e83bb06c20566bd41bccd593c98973..dc3916de31cfd8464bf8e174ecb28698133cb5d2 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -27,10 +27,25 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;

+import org.asamk.signal.storage.contacts.ContactInfo;
+import org.asamk.signal.storage.contacts.JsonContactsStore;
+import org.asamk.signal.storage.groups.GroupInfo;
+import org.asamk.signal.storage.groups.JsonGroupStore;
+import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
+import org.asamk.signal.storage.protocol.JsonSignalProtocolStore;
+import org.asamk.signal.storage.threads.JsonThreadStore;
+import org.asamk.signal.storage.threads.ThreadInfo;
+import org.asamk.signal.util.IOUtils;
+import org.asamk.signal.util.KeyUtils;
+import org.asamk.signal.util.Util;
+import org.signal.libsignal.metadata.*;
+import org.signal.libsignal.metadata.certificate.CertificateValidator;

 import org.whispersystems.libsignal.*;
 import org.whispersystems.libsignal.ecc.Curve;
 import org.whispersystems.libsignal.ecc.ECKeyPair;
 import org.whispersystems.libsignal.ecc.ECPublicKey;
 import org.whispersystems.libsignal.*;
 import org.whispersystems.libsignal.ecc.Curve;
 import org.whispersystems.libsignal.ecc.ECKeyPair;
 import org.whispersystems.libsignal.ecc.ECPublicKey;

+import org.whispersystems.libsignal.fingerprint.Fingerprint;
+import org.whispersystems.libsignal.fingerprint.NumericFingerprintGenerator;

 import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.util.KeyHelper;
 import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.util.KeyHelper;


@@ -41,40 +56,53 @@ import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 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.*;
 import org.whispersystems.signalservice.api.messages.multidevice.*;
 import org.whispersystems.signalservice.api.push.ContactTokenDetails;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.messages.*;
 import org.whispersystems.signalservice.api.messages.multidevice.*;
 import org.whispersystems.signalservice.api.push.ContactTokenDetails;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.TrustStore;

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

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

+import org.whispersystems.signalservice.api.util.SleepTimer;
+import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
+import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;

 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;

+import org.whispersystems.signalservice.internal.util.Base64;

 
 import java.io.*;
 import java.net.URI;
 import java.net.URISyntaxException;
 
 import java.io.*;
 import java.net.URI;
 import java.net.URISyntaxException;

-import java.net.URLDecoder;

 import java.net.URLEncoder;
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.nio.file.Files;
 import java.net.URLEncoder;
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.nio.file.Files;

-import java.nio.file.Path;

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

-import java.nio.file.attribute.PosixFilePermission;
-import java.nio.file.attribute.PosixFilePermissions;

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

-import static java.nio.file.attribute.PosixFilePermission.*;
-

 class Manager implements Signal {
     private final static String URL = "https://textsecure-service.whispersystems.org";
 class Manager implements Signal {
     private final static String URL = "https://textsecure-service.whispersystems.org";

+    private final static String CDN_URL = "https://cdn.signal.org";

     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();

+    private final static SignalServiceConfiguration serviceConfiguration = new SignalServiceConfiguration(
+            new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)},
+            new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
+            new SignalContactDiscoveryUrl[0]
+    );
+    private final static String UNIDENTIFIED_SENDER_TRUST_ROOT = "BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF";

 
     public final static String PROJECT_NAME = Manager.class.getPackage().getImplementationTitle();
     public final static String PROJECT_VERSION = Manager.class.getPackage().getImplementationVersion();
 
     public final static String PROJECT_NAME = Manager.class.getPackage().getImplementationTitle();
     public final static String PROJECT_VERSION = Manager.class.getPackage().getImplementationVersion();


@@ -82,6 +110,7 @@ class Manager implements Signal {
 
     private final static int PREKEY_MINIMUM_COUNT = 20;
     private static final int PREKEY_BATCH_SIZE = 100;
 
     private final static int PREKEY_MINIMUM_COUNT = 20;
     private static final int PREKEY_BATCH_SIZE = 100;

+    private static final int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;

 
     private final String settingsPath;
     private final String dataPath;
 
     private final String settingsPath;
     private final String dataPath;


@@ -91,11 +120,14 @@ class Manager implements Signal {
     private FileChannel fileChannel;
     private FileLock lock;
 
     private FileChannel fileChannel;
     private FileLock lock;
 

-    private final ObjectMapper jsonProcessot = new ObjectMapper();
+    private final ObjectMapper jsonProcessor = new ObjectMapper();

     private String username;
     private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
     private String username;
     private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;

+    private boolean isMultiDevice = false;

     private String password;
     private String password;

+    private String registrationLockPin;

     private String signalingKey;
     private String signalingKey;

+    private byte[] profileKey;

     private int preKeyIdOffset;
     private int nextSignedPreKeyId;
 
     private int preKeyIdOffset;
     private int nextSignedPreKeyId;
 


@@ -105,6 +137,11 @@ class Manager implements Signal {
     private SignalServiceAccountManager accountManager;
     private JsonGroupStore groupStore;
     private JsonContactsStore contactStore;
     private SignalServiceAccountManager accountManager;
     private JsonGroupStore groupStore;
     private JsonContactsStore contactStore;

+    private JsonThreadStore threadStore;
+    private SignalServiceMessagePipe messagePipe = null;
+    private SignalServiceMessagePipe unidentifiedMessagePipe = null;
+
+    private SleepTimer timer = new UptimeSleepTimer();

 
     public Manager(String username, String settingsPath) {
         this.username = username;
 
     public Manager(String username, String settingsPath) {
         this.username = username;


@@ -113,18 +150,22 @@ class Manager implements Signal {
         this.attachmentsPath = this.settingsPath + "/attachments";
         this.avatarsPath = this.settingsPath + "/avatars";
 
         this.attachmentsPath = this.settingsPath + "/attachments";
         this.avatarsPath = this.settingsPath + "/avatars";
 

-        jsonProcessot.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE); // disable autodetect
-        jsonProcessot.enable(SerializationFeature.INDENT_OUTPUT); // for pretty print, you can disable it.
-        jsonProcessot.enable(SerializationFeature.WRITE_NULL_MAP_VALUES);
-        jsonProcessot.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-        jsonProcessot.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
-        jsonProcessot.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+        jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE); // disable autodetect
+        jsonProcessor.enable(SerializationFeature.INDENT_OUTPUT); // for pretty print, you can disable it.
+        jsonProcessor.enable(SerializationFeature.WRITE_NULL_MAP_VALUES);
+        jsonProcessor.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+        jsonProcessor.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
+        jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);

     }
 
     public String getUsername() {
         return username;
     }
 
     }
 
     public String getUsername() {
         return username;
     }
 

+    private IdentityKey getIdentity() {
+        return signalProtocolStore.getIdentityKeyPair().getPublicKey();
+    }
+

     public int getDeviceId() {
         return deviceId;
     }
     public int getDeviceId() {
         return deviceId;
     }


@@ -143,30 +184,10 @@ class Manager implements Signal {
 
     private File getMessageCacheFile(String sender, long now, long timestamp) throws IOException {
         String cachePath = getMessageCachePath(sender);
 
     private File getMessageCacheFile(String sender, long now, long timestamp) throws IOException {
         String cachePath = getMessageCachePath(sender);

-        createPrivateDirectories(cachePath);
+        IOUtils.createPrivateDirectories(cachePath);

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

-    private static void createPrivateDirectories(String path) throws IOException {
-        final Path file = new File(path).toPath();
-        try {
-            Set<PosixFilePermission> perms = EnumSet.of(OWNER_READ, OWNER_WRITE, OWNER_EXECUTE);
-            Files.createDirectories(file, PosixFilePermissions.asFileAttribute(perms));
-        } catch (UnsupportedOperationException e) {
-            Files.createDirectories(file);
-        }
-    }
-
-    private static void createPrivateFile(String path) throws IOException {
-        final Path file = new File(path).toPath();
-        try {
-            Set<PosixFilePermission> perms = EnumSet.of(OWNER_READ, OWNER_WRITE);
-            Files.createFile(file, PosixFilePermissions.asFileAttribute(perms));
-        } catch (UnsupportedOperationException e) {
-            Files.createFile(file);
-        }
-    }
-

     public boolean userExists() {
         if (username == null) {
             return false;
     public boolean userExists() {
         if (username == null) {
             return false;


@@ -192,9 +213,9 @@ class Manager implements Signal {
         if (fileChannel != null)
             return;
 
         if (fileChannel != null)
             return;
 

-        createPrivateDirectories(dataPath);
+        IOUtils.createPrivateDirectories(dataPath);

         if (!new File(getFileName()).exists()) {
         if (!new File(getFileName()).exists()) {

-            createPrivateFile(getFileName());
+            IOUtils.createPrivateFile(getFileName());

         }
         fileChannel = new RandomAccessFile(new File(getFileName()), "rw").getChannel();
         lock = fileChannel.tryLock();
         }
         fileChannel = new RandomAccessFile(new File(getFileName()), "rw").getChannel();
         lock = fileChannel.tryLock();


@@ -205,9 +226,25 @@ class Manager implements Signal {
         }
     }
 
         }
     }
 

-    public void load() throws IOException, InvalidKeyException {
+    public void init() throws IOException {
+        load();
+
+        migrateLegacyConfigs();
+
+        accountManager = new SignalServiceAccountManager(serviceConfiguration, username, password, deviceId, USER_AGENT, timer);
+        try {
+            if (registered && accountManager.getPreKeysCount() < PREKEY_MINIMUM_COUNT) {
+                refreshPreKeys();
+                save();
+            }
+        } catch (AuthorizationFailedException e) {
+            System.err.println("Authorization failed, was the number registered elsewhere?");
+        }
+    }
+
+    private void load() throws IOException {

         openFileChannel();
         openFileChannel();

-        JsonNode rootNode = jsonProcessot.readTree(Channels.newInputStream(fileChannel));
+        JsonNode rootNode = jsonProcessor.readTree(Channels.newInputStream(fileChannel));

 
         JsonNode node = rootNode.get("deviceId");
         if (node != null) {
 
         JsonNode node = rootNode.get("deviceId");
         if (node != null) {


@@ -215,6 +252,8 @@ class Manager implements Signal {
         }
         username = getNotNullNode(rootNode, "username").asText();
         password = getNotNullNode(rootNode, "password").asText();
         }
         username = getNotNullNode(rootNode, "username").asText();
         password = getNotNullNode(rootNode, "password").asText();

+        JsonNode pinNode = rootNode.get("registrationLockPin");
+        registrationLockPin = pinNode == null ? null : pinNode.asText();

         if (rootNode.has("signalingKey")) {
             signalingKey = getNotNullNode(rootNode, "signalingKey").asText();
         }
         if (rootNode.has("signalingKey")) {
             signalingKey = getNotNullNode(rootNode, "signalingKey").asText();
         }


@@ -228,61 +267,69 @@ class Manager implements Signal {
         } else {
             nextSignedPreKeyId = 0;
         }
         } else {
             nextSignedPreKeyId = 0;
         }

-        signalProtocolStore = jsonProcessot.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonSignalProtocolStore.class);
+        if (rootNode.has("profileKey")) {
+            profileKey = Base64.decode(getNotNullNode(rootNode, "profileKey").asText());
+        } else {
+            // Old config file, creating new profile key
+            profileKey = KeyUtils.createProfileKey();
+        }
+
+        signalProtocolStore = jsonProcessor.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonSignalProtocolStore.class);

         registered = getNotNullNode(rootNode, "registered").asBoolean();
         JsonNode groupStoreNode = rootNode.get("groupStore");
         if (groupStoreNode != null) {
         registered = getNotNullNode(rootNode, "registered").asBoolean();
         JsonNode groupStoreNode = rootNode.get("groupStore");
         if (groupStoreNode != null) {

-            groupStore = jsonProcessot.convertValue(groupStoreNode, JsonGroupStore.class);
+            groupStore = jsonProcessor.convertValue(groupStoreNode, JsonGroupStore.class);

         }
         if (groupStore == null) {
             groupStore = new JsonGroupStore();
         }
         }
         if (groupStore == null) {
             groupStore = new JsonGroupStore();
         }

+
+        JsonNode contactStoreNode = rootNode.get("contactStore");
+        if (contactStoreNode != null) {
+            contactStore = jsonProcessor.convertValue(contactStoreNode, JsonContactsStore.class);
+        }
+        if (contactStore == null) {
+            contactStore = new JsonContactsStore();
+        }
+        JsonNode threadStoreNode = rootNode.get("threadStore");
+        if (threadStoreNode != null) {
+            threadStore = jsonProcessor.convertValue(threadStoreNode, JsonThreadStore.class);
+        }
+        if (threadStore == null) {
+            threadStore = new JsonThreadStore();
+        }
+    }
+
+    private void migrateLegacyConfigs() {

         // Copy group avatars that were previously stored in the attachments folder
         // to the new avatar folder
         // Copy group avatars that were previously stored in the attachments folder
         // to the new avatar folder

-        if (groupStore.groupsWithLegacyAvatarId.size() > 0) {
-            for (GroupInfo g : groupStore.groupsWithLegacyAvatarId) {
+        if (JsonGroupStore.groupsWithLegacyAvatarId.size() > 0) {
+            for (GroupInfo g : JsonGroupStore.groupsWithLegacyAvatarId) {

                 File avatarFile = getGroupAvatarFile(g.groupId);
                 File attachmentFile = getAttachmentFile(g.getAvatarId());
                 if (!avatarFile.exists() && attachmentFile.exists()) {
                     try {
                 File avatarFile = getGroupAvatarFile(g.groupId);
                 File attachmentFile = getAttachmentFile(g.getAvatarId());
                 if (!avatarFile.exists() && attachmentFile.exists()) {
                     try {

-                        createPrivateDirectories(avatarsPath);
+                        IOUtils.createPrivateDirectories(avatarsPath);

                         Files.copy(attachmentFile.toPath(), avatarFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
                     } catch (Exception e) {
                         // Ignore
                     }
                 }
             }
                         Files.copy(attachmentFile.toPath(), avatarFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
                     } catch (Exception e) {
                         // Ignore
                     }
                 }
             }

-            groupStore.groupsWithLegacyAvatarId.clear();
+            JsonGroupStore.groupsWithLegacyAvatarId.clear();

             save();
         }
             save();
         }

-
-        JsonNode contactStoreNode = rootNode.get("contactStore");
-        if (contactStoreNode != null) {
-            contactStore = jsonProcessot.convertValue(contactStoreNode, JsonContactsStore.class);
-        }
-        if (contactStore == null) {
-            contactStore = new JsonContactsStore();
-        }
-
-        accountManager = new SignalServiceAccountManager(URL, TRUST_STORE, username, password, deviceId, USER_AGENT);
-        try {
-            if (registered && accountManager.getPreKeysCount() < PREKEY_MINIMUM_COUNT) {
-                refreshPreKeys();
-                save();
-            }
-        } catch (AuthorizationFailedException e) {
-            System.err.println("Authorization failed, was the number registered elsewhere?");
-        }

     }
 
     private void save() {
         if (username == null) {
             return;
         }
     }
 
     private void save() {
         if (username == null) {
             return;
         }

-        ObjectNode rootNode = jsonProcessot.createObjectNode();
+        ObjectNode rootNode = jsonProcessor.createObjectNode();

         rootNode.put("username", username)
                 .put("deviceId", deviceId)
                 .put("password", password)
         rootNode.put("username", username)
                 .put("deviceId", deviceId)
                 .put("password", password)

+                .put("registrationLockPin", registrationLockPin)

                 .put("signalingKey", signalingKey)
                 .put("preKeyIdOffset", preKeyIdOffset)
                 .put("nextSignedPreKeyId", nextSignedPreKeyId)
                 .put("signalingKey", signalingKey)
                 .put("preKeyIdOffset", preKeyIdOffset)
                 .put("nextSignedPreKeyId", nextSignedPreKeyId)


@@ -290,11 +337,12 @@ class Manager implements Signal {
                 .putPOJO("axolotlStore", signalProtocolStore)
                 .putPOJO("groupStore", groupStore)
                 .putPOJO("contactStore", contactStore)
                 .putPOJO("axolotlStore", signalProtocolStore)
                 .putPOJO("groupStore", groupStore)
                 .putPOJO("contactStore", contactStore)

+                .putPOJO("threadStore", threadStore)

         ;
         try {
             openFileChannel();
             fileChannel.position(0);
         ;
         try {
             openFileChannel();
             fileChannel.position(0);

-            jsonProcessot.writeValue(Channels.newOutputStream(fileChannel), rootNode);
+            jsonProcessor.writeValue(Channels.newOutputStream(fileChannel), rootNode);

             fileChannel.truncate(fileChannel.position());
             fileChannel.force(false);
         } catch (Exception e) {
             fileChannel.truncate(fileChannel.position());
             fileChannel.force(false);
         } catch (Exception e) {


@@ -316,9 +364,9 @@ class Manager implements Signal {
     }
 
     public void register(boolean voiceVerification) throws IOException {
     }
 
     public void register(boolean voiceVerification) throws IOException {

-        password = Util.getSecret(18);
+        password = KeyUtils.createPassword();

 
 

-        accountManager = new SignalServiceAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
+        accountManager = new SignalServiceAccountManager(serviceConfiguration, username, password, USER_AGENT, timer);

 
         if (voiceVerification)
             accountManager.requestVoiceVerificationCode();
 
         if (voiceVerification)
             accountManager.requestVoiceVerificationCode();


@@ -329,10 +377,21 @@ class Manager implements Signal {
         save();
     }
 
         save();
     }
 

+    public void updateAccountAttributes() throws IOException {
+        accountManager.setAccountAttributes(signalingKey, signalProtocolStore.getLocalRegistrationId(), true, registrationLockPin, getSelfUnidentifiedAccessKey(), false);
+    }
+
+    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.<String>absent());
+    }
+

     public URI getDeviceLinkUri() throws TimeoutException, IOException {
     public URI getDeviceLinkUri() throws TimeoutException, IOException {

-        password = Util.getSecret(18);
+        password = KeyUtils.createPassword();

 
 

-        accountManager = new SignalServiceAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
+        accountManager = new SignalServiceAccountManager(serviceConfiguration, username, password, USER_AGENT, timer);

         String uuid = accountManager.getNewDeviceUuid();
 
         registered = false;
         String uuid = accountManager.getNewDeviceUuid();
 
         registered = false;


@@ -345,7 +404,7 @@ class Manager implements Signal {
     }
 
     public void finishDeviceLink(String deviceName) throws IOException, InvalidKeyException, TimeoutException, UserAlreadyExists {
     }
 
     public void finishDeviceLink(String deviceName) throws IOException, InvalidKeyException, TimeoutException, UserAlreadyExists {

-        signalingKey = Util.getSecret(52);
+        signalingKey = KeyUtils.createSignalingKey();

         SignalServiceAccountManager.NewDeviceRegistrationReturn ret = accountManager.finishNewDeviceRegistration(signalProtocolStore.getIdentityKeyPair(), signalingKey, false, true, signalProtocolStore.getLocalRegistrationId(), deviceName);
         deviceId = ret.getDeviceId();
         username = ret.getNumber();
         SignalServiceAccountManager.NewDeviceRegistrationReturn ret = accountManager.finishNewDeviceRegistration(signalProtocolStore.getIdentityKeyPair(), signalingKey, false, true, signalProtocolStore.getLocalRegistrationId(), deviceName);
         deviceId = ret.getDeviceId();
         username = ret.getNumber();


@@ -356,6 +415,7 @@ class Manager implements Signal {
         signalProtocolStore = new JsonSignalProtocolStore(ret.getIdentity(), signalProtocolStore.getLocalRegistrationId());
 
         registered = true;
         signalProtocolStore = new JsonSignalProtocolStore(ret.getIdentity(), signalProtocolStore.getLocalRegistrationId());
 
         registered = true;

+        isMultiDevice = true;

         refreshPreKeys();
 
         requestSyncGroups();
         refreshPreKeys();
 
         requestSyncGroups();


@@ -365,36 +425,17 @@ class Manager implements Signal {
     }
 
     public List<DeviceInfo> getLinkedDevices() throws IOException {
     }
 
     public List<DeviceInfo> getLinkedDevices() throws IOException {

-        return accountManager.getDevices();
+        List<DeviceInfo> devices = accountManager.getDevices();
+        isMultiDevice = devices.size() > 1;
+        return devices;

     }
 
     public void removeLinkedDevices(int deviceId) throws IOException {
         accountManager.removeDevice(deviceId);
     }
 
     }
 
     public void removeLinkedDevices(int deviceId) throws IOException {
         accountManager.removeDevice(deviceId);
     }
 

-    public static Map<String, String> getQueryMap(String query) {
-        String[] params = query.split("&");
-        Map<String, String> map = new HashMap<>();
-        for (String param : params) {
-            String name = null;
-            try {
-                name = URLDecoder.decode(param.split("=")[0], "utf-8");
-            } catch (UnsupportedEncodingException e) {
-                // Impossible
-            }
-            String value = null;
-            try {
-                value = URLDecoder.decode(param.split("=")[1], "utf-8");
-            } catch (UnsupportedEncodingException e) {
-                // Impossible
-            }
-            map.put(name, value);
-        }
-        return map;
-    }
-

     public void addDeviceLink(URI linkUri) throws IOException, InvalidKeyException {
     public void addDeviceLink(URI linkUri) throws IOException, InvalidKeyException {

-        Map<String, String> query = getQueryMap(linkUri.getRawQuery());
+        Map<String, String> query = Util.getQueryMap(linkUri.getRawQuery());

         String deviceIdentifier = query.get("uuid");
         String publicKeyEncoded = query.get("pub_key");
 
         String deviceIdentifier = query.get("uuid");
         String publicKeyEncoded = query.get("pub_key");
 


@@ -411,7 +452,8 @@ class Manager implements Signal {
         IdentityKeyPair identityKeyPair = signalProtocolStore.getIdentityKeyPair();
         String verificationCode = accountManager.getNewDeviceVerificationCode();
 
         IdentityKeyPair identityKeyPair = signalProtocolStore.getIdentityKeyPair();
         String verificationCode = accountManager.getNewDeviceVerificationCode();
 

-        accountManager.addDevice(deviceIdentifier, deviceKey, identityKeyPair, verificationCode);
+        accountManager.addDevice(deviceIdentifier, deviceKey, identityKeyPair, Optional.of(profileKey), verificationCode);
+        isMultiDevice = true;

     }
 
     private List<PreKeyRecord> generatePreKeys() {
     }
 
     private List<PreKeyRecord> generatePreKeys() {


@@ -432,24 +474,6 @@ class Manager implements Signal {
         return records;
     }
 
         return records;
     }
 

-    private PreKeyRecord getOrGenerateLastResortPreKey() {
-        if (signalProtocolStore.containsPreKey(Medium.MAX_VALUE)) {
-            try {
-                return signalProtocolStore.loadPreKey(Medium.MAX_VALUE);
-            } catch (InvalidKeyIdException e) {
-                signalProtocolStore.removePreKey(Medium.MAX_VALUE);
-            }
-        }
-
-        ECKeyPair keyPair = Curve.generateKeyPair();
-        PreKeyRecord record = new PreKeyRecord(Medium.MAX_VALUE, keyPair);
-
-        signalProtocolStore.storePreKey(Medium.MAX_VALUE, record);
-        save();
-
-        return record;
-    }
-

     private SignedPreKeyRecord generateSignedPreKey(IdentityKeyPair identityKeyPair) {
         try {
             ECKeyPair keyPair = Curve.generateKeyPair();
     private SignedPreKeyRecord generateSignedPreKey(IdentityKeyPair identityKeyPair) {
         try {
             ECKeyPair keyPair = Curve.generateKeyPair();


@@ -466,24 +490,33 @@ class Manager implements Signal {
         }
     }
 
         }
     }
 

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

         verificationCode = verificationCode.replace("-", "");
         verificationCode = verificationCode.replace("-", "");

-        signalingKey = Util.getSecret(52);
-        accountManager.verifyAccountWithCode(verificationCode, signalingKey, signalProtocolStore.getLocalRegistrationId(), false, true);
+        signalingKey = KeyUtils.createSignalingKey();
+        accountManager.verifyAccountWithCode(verificationCode, signalingKey, signalProtocolStore.getLocalRegistrationId(), true, pin, getSelfUnidentifiedAccessKey(), false);

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

+        registrationLockPin = pin;

 
         refreshPreKeys();
         save();
     }
 
 
         refreshPreKeys();
         save();
     }
 

+    public void setRegistrationLockPin(Optional<String> pin) throws IOException {
+        accountManager.setPin(pin);
+        if (pin.isPresent()) {
+            registrationLockPin = pin.get();
+        } else {
+            registrationLockPin = null;
+        }
+    }
+

     private void refreshPreKeys() throws IOException {
         List<PreKeyRecord> oneTimePreKeys = generatePreKeys();
     private void refreshPreKeys() throws IOException {
         List<PreKeyRecord> oneTimePreKeys = generatePreKeys();

-        PreKeyRecord lastResortKey = getOrGenerateLastResortPreKey();

         SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(signalProtocolStore.getIdentityKeyPair());
 
         SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(signalProtocolStore.getIdentityKeyPair());
 

-        accountManager.setPreKeys(signalProtocolStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys);
+        accountManager.setPreKeys(signalProtocolStore.getIdentityKeyPair().getPublicKey(), signedPreKeyRecord, oneTimePreKeys);

     }
 
 
     }
 
 


@@ -509,7 +542,10 @@ class Manager implements Signal {
         if (mime == null) {
             mime = "application/octet-stream";
         }
         if (mime == null) {
             mime = "application/octet-stream";
         }

-        return new SignalServiceAttachmentStream(attachmentStream, mime, attachmentSize, null);
+        // TODO mabybe add a parameter to set the voiceNote, preview, width, height and caption option
+        Optional<byte[]> preview = Optional.absent();
+        Optional<String> caption = Optional.absent();
+        return new SignalServiceAttachmentStream(attachmentStream, mime, attachmentSize, Optional.of(attachmentFile.getName()), false, preview, 0, 0, caption, null);

     }
 
     private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException {
     }
 
     private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException {


@@ -543,6 +579,10 @@ class Manager implements Signal {
         throw new NotAGroupMemberException(groupId, g.name);
     }
 
         throw new NotAGroupMemberException(groupId, g.name);
     }
 

+    public List<GroupInfo> getGroups() {
+        return groupStore.getGroups();
+    }
+

     @Override
     public void sendGroupMessage(String messageText, List<String> attachments,
                                  byte[] groupId)
     @Override
     public void sendGroupMessage(String messageText, List<String> attachments,
                                  byte[] groupId)


@@ -557,14 +597,17 @@ class Manager implements Signal {
                     .build();
             messageBuilder.asGroupMessage(group);
         }
                     .build();
             messageBuilder.asGroupMessage(group);
         }

-        SignalServiceDataMessage message = messageBuilder.build();
+        ThreadInfo thread = threadStore.getThread(Base64.encodeBytes(groupId));
+        if (thread != null) {
+            messageBuilder.withExpiration(thread.messageExpirationTime);
+        }

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

-        sendMessage(message, membersSend);
+        sendMessageLegacy(messageBuilder, membersSend);

     }
 
     public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions {
     }
 
     public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions {


@@ -572,34 +615,21 @@ class Manager implements Signal {
                 .withId(groupId)
                 .build();
 
                 .withId(groupId)
                 .build();
 

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

 
         final GroupInfo g = getGroupForSending(groupId);
         g.members.remove(this.username);
         groupStore.updateGroup(g);
 
 
         final GroupInfo g = getGroupForSending(groupId);
         g.members.remove(this.username);
         groupStore.updateGroup(g);
 

-        sendMessage(message, g.members);
-    }
-
-    private static String join(CharSequence separator, Iterable<? extends CharSequence> list) {
-        StringBuilder buf = new StringBuilder();
-        for (CharSequence str : list) {
-            if (buf.length() > 0) {
-                buf.append(separator);
-            }
-            buf.append(str);
-        }
-
-        return buf.toString();
+        sendMessageLegacy(messageBuilder, g.members);

     }
 
     public byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection<String> members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
         GroupInfo g;
         if (groupId == null) {
             // Create new group
     }
 
     public byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection<String> members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
         GroupInfo g;
         if (groupId == null) {
             // Create new group

-            g = new GroupInfo(Util.getSecretBytes(16));
+            g = new GroupInfo(KeyUtils.createGroupId());

             g.members.add(username);
         } else {
             g = getGroupForSending(groupId);
             g.members.add(username);
         } else {
             g = getGroupForSending(groupId);


@@ -631,41 +661,81 @@ class Manager implements Signal {
                 for (ContactTokenDetails contact : contacts) {
                     newMembers.remove(contact.getNumber());
                 }
                 for (ContactTokenDetails contact : contacts) {
                     newMembers.remove(contact.getNumber());
                 }

-                System.err.println("Failed to add members " + join(", ", newMembers) + " to group: Not registered on Signal");
+                System.err.println("Failed to add members " + Util.join(", ", newMembers) + " to group: Not registered on Signal");

                 System.err.println("Aborting…");
                 System.exit(1);
             }
         }
 
                 System.err.println("Aborting…");
                 System.exit(1);
             }
         }
 

+        if (avatarFile != null) {
+            IOUtils.createPrivateDirectories(avatarsPath);
+            File aFile = getGroupAvatarFile(g.groupId);
+            Files.copy(Paths.get(avatarFile), aFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        }
+
+        groupStore.updateGroup(g);
+
+        SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(g);
+
+        // Don't send group message to ourself
+        final List<String> membersSend = new ArrayList<>(g.members);
+        membersSend.remove(this.username);
+        sendMessageLegacy(messageBuilder, membersSend);
+        return g.groupId;
+    }
+
+    private void sendUpdateGroupMessage(byte[] groupId, String recipient) throws IOException, EncapsulatedExceptions {
+        if (groupId == null) {
+            return;
+        }
+        GroupInfo g = getGroupForSending(groupId);
+
+        if (!g.members.contains(recipient)) {
+            return;
+        }
+
+        SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(g);
+
+        // Send group message only to the recipient who requested it
+        final List<String> membersSend = new ArrayList<>();
+        membersSend.add(recipient);
+        sendMessageLegacy(messageBuilder, membersSend);
+    }
+
+    private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfo g) {

         SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
                 .withId(g.groupId)
                 .withName(g.name)
                 .withMembers(new ArrayList<>(g.members));
 
         File aFile = getGroupAvatarFile(g.groupId);
         SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
                 .withId(g.groupId)
                 .withName(g.name)
                 .withMembers(new ArrayList<>(g.members));
 
         File aFile = getGroupAvatarFile(g.groupId);

-        if (avatarFile != null) {
-            createPrivateDirectories(avatarsPath);
-            Files.copy(Paths.get(avatarFile), aFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-        }

         if (aFile.exists()) {
             try {
                 group.withAvatar(createAttachment(aFile));
             } catch (IOException e) {
         if (aFile.exists()) {
             try {
                 group.withAvatar(createAttachment(aFile));
             } catch (IOException e) {

-                throw new AttachmentInvalidException(avatarFile, e);
+                throw new AttachmentInvalidException(aFile.toString(), e);

             }
         }
 
             }
         }
 

-        groupStore.updateGroup(g);
+        return SignalServiceDataMessage.newBuilder()
+                .asGroupMessage(group.build());
+    }

 
 

-        SignalServiceDataMessage message = SignalServiceDataMessage.newBuilder()
-                .asGroupMessage(group.build())
-                .build();
+    private void sendGroupInfoRequest(byte[] groupId, String recipient) throws IOException, EncapsulatedExceptions {
+        if (groupId == null) {
+            return;
+        }

 
 

-        // Don't send group message to ourself
-        final List<String> membersSend = new ArrayList<>(g.members);
-        membersSend.remove(this.username);
-        sendMessage(message, membersSend);
-        return g.groupId;
+        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
+        final List<String> membersSend = new ArrayList<>();
+        membersSend.add(recipient);
+        sendMessageLegacy(messageBuilder, membersSend);

     }
 
     @Override
     }
 
     @Override


@@ -684,25 +754,94 @@ class Manager implements Signal {
         if (attachments != null) {
             messageBuilder.withAttachments(getSignalServiceAttachments(attachments));
         }
         if (attachments != null) {
             messageBuilder.withAttachments(getSignalServiceAttachments(attachments));
         }

-        SignalServiceDataMessage message = messageBuilder.build();
-
-        sendMessage(message, recipients);
+        sendMessageLegacy(messageBuilder, recipients);

     }
 
     @Override
     public void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions {
     }
 
     @Override
     public void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions {

-        SignalServiceDataMessage message = SignalServiceDataMessage.newBuilder()
-                .asEndSessionMessage()
-                .build();
+        SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
+                .asEndSessionMessage();
+
+        sendMessageLegacy(messageBuilder, recipients);
+    }
+
+    @Override
+    public String getContactName(String number) {
+        ContactInfo contact = contactStore.getContact(number);
+        if (contact == null) {
+            return "";
+        } else {
+            return contact.name;
+        }
+    }
+
+    @Override
+    public void setContactName(String number, String name) {
+        ContactInfo contact = contactStore.getContact(number);
+        if (contact == null) {
+            contact = new ContactInfo();
+            contact.number = number;
+            System.err.println("Add contact " + number + " named " + name);
+        } else {
+            System.err.println("Updating contact " + number + " name " + contact.name + " -> " + name);
+        }
+        contact.name = name;
+        contactStore.updateContact(contact);
+        save();
+    }
+
+    @Override
+    public List<byte[]> getGroupIds() {
+        List<GroupInfo> groups = getGroups();
+        List<byte[]> ids = new ArrayList<byte[]>(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 new ArrayList<String>();
+        } else {
+            return new ArrayList<String>(group.members);
+        }
+    }

 
 

-        sendMessage(message, recipients);
+    @Override
+    public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
+        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, avatar);

     }
 
     private 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 {
     }
 
     private 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 {

-            sendMessage(message);
+            sendSyncMessage(message);

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


@@ -712,73 +851,123 @@ class Manager implements Signal {
         SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder().setType(SignalServiceProtos.SyncMessage.Request.Type.CONTACTS).build();
         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
         SignalServiceProtos.SyncMessage.Request r = SignalServiceProtos.SyncMessage.Request.newBuilder().setType(SignalServiceProtos.SyncMessage.Request.Type.CONTACTS).build();
         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {

-            sendMessage(message);
+            sendSyncMessage(message);

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

-    private void sendMessage(SignalServiceSyncMessage message)
+    private byte[] getSelfUnidentifiedAccessKey() {
+        return UnidentifiedAccess.deriveAccessKeyFrom(profileKey);
+    }
+
+    private byte[] getTargetUnidentifiedAccessKey(SignalServiceAddress recipient) {
+        // TODO implement
+        return null;
+    }
+
+    public Optional<UnidentifiedAccessPair> getAccessForSync() {
+        // TODO implement
+        return Optional.absent();
+    }
+
+    public List<Optional<UnidentifiedAccessPair>> getAccessFor(Collection<SignalServiceAddress> recipients) {
+        List<Optional<UnidentifiedAccessPair>> result = new ArrayList<>(recipients.size());
+        for (SignalServiceAddress recipient : recipients) {
+            result.add(Optional.<UnidentifiedAccessPair>absent());
+        }
+        return result;
+    }
+
+    public Optional<UnidentifiedAccessPair> getAccessFor(SignalServiceAddress recipient) {
+        // TODO implement
+        return Optional.absent();
+    }
+
+    private void sendSyncMessage(SignalServiceSyncMessage message)

             throws IOException, UntrustedIdentityException {
             throws IOException, UntrustedIdentityException {

-        SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
-                deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
+        SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceConfiguration, username, password,
+                deviceId, signalProtocolStore, USER_AGENT, isMultiDevice, Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());

         try {
         try {

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

         } catch (UntrustedIdentityException e) {
             signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
             throw e;
         }
     }
 
         } catch (UntrustedIdentityException e) {
             signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
             throw e;
         }
     }
 

-    private void sendMessage(SignalServiceDataMessage message, Collection<String> recipients)
+    /**
+     * This method throws an EncapsulatedExceptions exception instead of returning a list of SendMessageResult.
+     */
+    private void sendMessageLegacy(SignalServiceDataMessage.Builder messageBuilder, Collection<String> recipients)

             throws EncapsulatedExceptions, IOException {
             throws EncapsulatedExceptions, IOException {

-        Set<SignalServiceAddress> recipientsTS = new HashSet<>(recipients.size());
-        for (String recipient : recipients) {
-            try {
-                recipientsTS.add(getPushAddress(recipient));
-            } catch (InvalidNumberException e) {
-                System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
-                System.err.println("Aborting sending.");
-                save();
-                return;
+        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().getNumber(), null));
+            } else if (result.isNetworkFailure()) {
+                networkExceptions.add(new NetworkFailureException(result.getAddress().getNumber(), null));
+            } else if (result.getIdentityFailure() != null) {
+                untrustedIdentities.add(new UntrustedIdentityException("Untrusted", result.getAddress().getNumber(), result.getIdentityFailure().getIdentityKey()));

             }
         }
             }
         }

+        if (!untrustedIdentities.isEmpty() || !unregisteredUsers.isEmpty() || !networkExceptions.isEmpty()) {
+            throw new EncapsulatedExceptions(untrustedIdentities, unregisteredUsers, networkExceptions);
+        }
+    }
+
+    private List<SendMessageResult> sendMessage(SignalServiceDataMessage.Builder messageBuilder, Collection<String> recipients)
+            throws IOException {
+        Set<SignalServiceAddress> recipientsTS = getSignalServiceAddresses(recipients);
+        if (recipientsTS == null) return Collections.emptyList();

 
 

+        SignalServiceDataMessage message = null;

         try {
         try {

-            SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
-                    deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
+            SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceConfiguration, username, password,
+                    deviceId, signalProtocolStore, USER_AGENT, isMultiDevice, Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());

 
 

+            message = messageBuilder.build();

             if (message.getGroupInfo().isPresent()) {
                 try {
             if (message.getGroupInfo().isPresent()) {
                 try {

-                    messageSender.sendMessage(new ArrayList<>(recipientsTS), message);
-                } catch (EncapsulatedExceptions encapsulatedExceptions) {
-                    for (UntrustedIdentityException e : encapsulatedExceptions.getUntrustedIdentityExceptions()) {
-                        signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
+                    List<SendMessageResult> result = messageSender.sendMessage(new ArrayList<>(recipientsTS), getAccessFor(recipientsTS), message);
+                    for (SendMessageResult r : result) {
+                        if (r.getIdentityFailure() != null) {
+                            signalProtocolStore.saveIdentity(r.getAddress().getNumber(), r.getIdentityFailure().getIdentityKey(), TrustLevel.UNTRUSTED);
+                        }

                     }
                     }

+                    return result;
+                } catch (UntrustedIdentityException e) {
+                    signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
+                    return Collections.emptyList();

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

-                List<UntrustedIdentityException> untrustedIdentities = new LinkedList<>();
-                List<UnregisteredUserException> unregisteredUsers = new LinkedList<>();
-                List<NetworkFailureException> networkExceptions = new LinkedList<>();
+                List<SendMessageResult> results = new ArrayList<>(recipientsTS.size());

                 for (SignalServiceAddress address : recipientsTS) {
                 for (SignalServiceAddress address : recipientsTS) {

+                    ThreadInfo thread = threadStore.getThread(address.getNumber());
+                    if (thread != null) {
+                        messageBuilder.withExpiration(thread.messageExpirationTime);
+                    } else {
+                        messageBuilder.withExpiration(0);
+                    }
+                    message = messageBuilder.build();

                     try {
                     try {

-                        messageSender.sendMessage(address, message);
+                        SendMessageResult result = messageSender.sendMessage(address, getAccessFor(address), message);
+                        results.add(result);

                     } catch (UntrustedIdentityException e) {
                         signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
                     } catch (UntrustedIdentityException e) {
                         signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);

-                        untrustedIdentities.add(e);
-                    } catch (UnregisteredUserException e) {
-                        unregisteredUsers.add(e);
-                    } catch (PushNetworkException e) {
-                        networkExceptions.add(new NetworkFailureException(address.getNumber(), e));
+                        results.add(SendMessageResult.identityFailure(address, e.getIdentityKey()));

                     }
                 }
                     }
                 }

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

             }
         } finally {
             }
         } finally {

-            if (message.isEndSession()) {
+            if (message != null && message.isEndSession()) {

                 for (SignalServiceAddress recipient : recipientsTS) {
                     handleEndSession(recipient.getNumber());
                 }
                 for (SignalServiceAddress recipient : recipientsTS) {
                     handleEndSession(recipient.getNumber());
                 }


@@ -787,12 +976,37 @@ class Manager implements Signal {
         }
     }
 
         }
     }
 

-    private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws NoSessionException, LegacyMessageException, InvalidVersionException, InvalidMessageException, DuplicateMessageException, InvalidKeyException, InvalidKeyIdException, org.whispersystems.libsignal.UntrustedIdentityException {
-        SignalServiceCipher cipher = new SignalServiceCipher(new SignalServiceAddress(username), signalProtocolStore);
+    private Set<SignalServiceAddress> getSignalServiceAddresses(Collection<String> recipients) {
+        Set<SignalServiceAddress> recipientsTS = new HashSet<>(recipients.size());
+        for (String recipient : recipients) {
+            try {
+                recipientsTS.add(getPushAddress(recipient));
+            } catch (InvalidNumberException e) {
+                System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
+                System.err.println("Aborting sending.");
+                save();
+                return null;
+            }
+        }
+        return recipientsTS;
+    }
+
+    public static CertificateValidator getCertificateValidator() {
+        try {
+            ECPublicKey unidentifiedSenderTrustRoot = Curve.decodePoint(Base64.decode(UNIDENTIFIED_SENDER_TRUST_ROOT), 0);
+            return new CertificateValidator(unidentifiedSenderTrustRoot);
+        } catch (InvalidKeyException | IOException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws org.whispersystems.libsignal.UntrustedIdentityException, InvalidMetadataMessageException, ProtocolInvalidMessageException, ProtocolDuplicateMessageException, ProtocolLegacyMessageException, ProtocolInvalidKeyIdException, InvalidMetadataVersionException, ProtocolInvalidVersionException, ProtocolNoSessionException, ProtocolInvalidKeyException, ProtocolUntrustedIdentityException, SelfSendException {
+        SignalServiceCipher cipher = new SignalServiceCipher(new SignalServiceAddress(username), signalProtocolStore, getCertificateValidator());

         try {
             return cipher.decrypt(envelope);
         try {
             return cipher.decrypt(envelope);

-        } catch (org.whispersystems.libsignal.UntrustedIdentityException e) {
-            signalProtocolStore.saveIdentity(e.getName(), e.getUntrustedIdentity(), TrustLevel.UNTRUSTED);
+        } catch (ProtocolUntrustedIdentityException e) {
+            // TODO We don't get the new untrusted identity from ProtocolUntrustedIdentityException anymore ... we need to get it from somewhere else
+//            signalProtocolStore.saveIdentity(e.getSender(), e.getUntrustedIdentity(), TrustLevel.UNTRUSTED);

             throw e;
         }
     }
             throw e;
         }
     }


@@ -805,13 +1019,14 @@ class Manager implements Signal {
         void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent decryptedContent, Throwable e);
     }
 
         void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent decryptedContent, Throwable e);
     }
 

-    private void handleSignalServiceDataMessage(SignalServiceDataMessage message, boolean isSync, String source, String destination) {
+    private void handleSignalServiceDataMessage(SignalServiceDataMessage message, boolean isSync, String source, String destination, boolean ignoreAttachments) {
+        String threadId;

         if (message.getGroupInfo().isPresent()) {
             SignalServiceGroup groupInfo = message.getGroupInfo().get();
         if (message.getGroupInfo().isPresent()) {
             SignalServiceGroup groupInfo = message.getGroupInfo().get();

+            threadId = Base64.encodeBytes(groupInfo.getGroupId());
+            GroupInfo group = groupStore.getGroup(groupInfo.getGroupId());

             switch (groupInfo.getType()) {
                 case UPDATE:
             switch (groupInfo.getType()) {
                 case UPDATE:

-                    GroupInfo group;
-                    group = groupStore.getGroup(groupInfo.getGroupId());

                     if (group == null) {
                         group = new GroupInfo(groupInfo.getGroupId());
                     }
                     if (group == null) {
                         group = new GroupInfo(groupInfo.getGroupId());
                     }


@@ -838,20 +1053,60 @@ class Manager implements Signal {
                     groupStore.updateGroup(group);
                     break;
                 case DELIVER:
                     groupStore.updateGroup(group);
                     break;
                 case DELIVER:

+                    if (group == null) {
+                        try {
+                            sendGroupInfoRequest(groupInfo.getGroupId(), source);
+                        } catch (IOException | EncapsulatedExceptions e) {
+                            e.printStackTrace();
+                        }
+                    }

                     break;
                 case QUIT:
                     break;
                 case QUIT:

-                    group = groupStore.getGroup(groupInfo.getGroupId());
-                    if (group != null) {
+                    if (group == null) {
+                        try {
+                            sendGroupInfoRequest(groupInfo.getGroupId(), source);
+                        } catch (IOException | EncapsulatedExceptions e) {
+                            e.printStackTrace();
+                        }
+                    } else {

                         group.members.remove(source);
                         groupStore.updateGroup(group);
                     }
                     break;
                         group.members.remove(source);
                         groupStore.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;
+            }
+        } else {
+            if (isSync) {
+                threadId = destination;
+            } else {
+                threadId = source;

             }
         }
         if (message.isEndSession()) {
             handleEndSession(isSync ? destination : source);
         }
             }
         }
         if (message.isEndSession()) {
             handleEndSession(isSync ? destination : source);
         }

-        if (message.getAttachments().isPresent()) {
+        if (message.isExpirationUpdate() || message.getBody().isPresent()) {
+            ThreadInfo thread = threadStore.getThread(threadId);
+            if (thread == null) {
+                thread = new ThreadInfo();
+                thread.id = threadId;
+            }
+            if (thread.messageExpirationTime != message.getExpiresInSeconds()) {
+                thread.messageExpirationTime = message.getExpiresInSeconds();
+                threadStore.updateThread(thread);
+            }
+        }
+        if (message.getAttachments().isPresent() && !ignoreAttachments) {

             for (SignalServiceAttachment attachment : message.getAttachments().get()) {
                 if (attachment.isPointer()) {
                     try {
             for (SignalServiceAttachment attachment : message.getAttachments().get()) {
                 if (attachment.isPointer()) {
                     try {


@@ -862,9 +1117,17 @@ class Manager implements Signal {
                 }
             }
         }
                 }
             }
         }

+        if (message.getProfileKey().isPresent() && message.getProfileKey().get().length == 32) {
+            ContactInfo contact = contactStore.getContact(source);
+            if (contact == null) {
+                contact = new ContactInfo();
+                contact.number = source;
+            }
+            contact.profileKey = Base64.encodeBytes(message.getProfileKey().get());
+        }

     }
 
     }
 

-    public void retryFailedReceivedMessages(ReceiveMessageHandler handler) {
+    public void retryFailedReceivedMessages(ReceiveMessageHandler handler, boolean ignoreAttachments) {

         final File cachePath = new File(getMessageCachePath());
         if (!cachePath.exists()) {
             return;
         final File cachePath = new File(getMessageCachePath());
         if (!cachePath.exists()) {
             return;


@@ -874,7 +1137,6 @@ class Manager implements Signal {
                 continue;
             }
 
                 continue;
             }
 

-            String sender = dir.getName();

             for (final File fileEntry : dir.listFiles()) {
                 if (!fileEntry.isFile()) {
                     continue;
             for (final File fileEntry : dir.listFiles()) {
                 if (!fileEntry.isFile()) {
                     continue;


@@ -896,22 +1158,29 @@ class Manager implements Signal {
                     } catch (Exception e) {
                         continue;
                     }
                     } catch (Exception e) {
                         continue;
                     }

-                    handleMessage(envelope, content);
+                    handleMessage(envelope, content, ignoreAttachments);

                 }
                 save();
                 handler.handleMessage(envelope, content, null);
                 }
                 save();
                 handler.handleMessage(envelope, content, null);

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

             }
             }

+            // Try to delete directory if empty
+            dir.delete();

         }
     }
 
         }
     }
 

-    public void receiveMessages(int timeoutSeconds, boolean returnOnTimeout, ReceiveMessageHandler handler) throws IOException {
-        retryFailedReceivedMessages(handler);
-        final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(URL, TRUST_STORE, username, password, deviceId, signalingKey, USER_AGENT);
-        SignalServiceMessagePipe messagePipe = null;
+    public void receiveMessages(long timeout, TimeUnit unit, boolean returnOnTimeout, boolean ignoreAttachments, ReceiveMessageHandler handler) throws IOException {
+        retryFailedReceivedMessages(handler, ignoreAttachments);
+        final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceConfiguration, username, password, deviceId, signalingKey, USER_AGENT, null, timer);

 
         try {
 
         try {

-            messagePipe = messageReceiver.createMessagePipe();
+            if (messagePipe == null) {
+                messagePipe = messageReceiver.createMessagePipe();
+            }

 
             while (true) {
                 SignalServiceEnvelope envelope;
 
             while (true) {
                 SignalServiceEnvelope envelope;


@@ -919,7 +1188,7 @@ class Manager implements Signal {
                 Exception exception = null;
                 final long now = new Date().getTime();
                 try {
                 Exception exception = null;
                 final long now = new Date().getTime();
                 try {

-                    envelope = messagePipe.read(timeoutSeconds, TimeUnit.SECONDS, new SignalServiceMessagePipe.MessagePipeCallback() {
+                    envelope = messagePipe.read(timeout, unit, new SignalServiceMessagePipe.MessagePipeCallback() {

                         @Override
                         public void onMessage(SignalServiceEnvelope envelope) {
                             // store message on disk, before acknowledging receipt to the server
                         @Override
                         public void onMessage(SignalServiceEnvelope envelope) {
                             // store message on disk, before acknowledging receipt to the server


@@ -945,37 +1214,42 @@ class Manager implements Signal {
                     } catch (Exception e) {
                         exception = e;
                     }
                     } catch (Exception e) {
                         exception = e;
                     }

-                    handleMessage(envelope, content);
+                    handleMessage(envelope, content, ignoreAttachments);

                 }
                 save();
                 handler.handleMessage(envelope, content, exception);
                 if (exception == null || !(exception instanceof org.whispersystems.libsignal.UntrustedIdentityException)) {
                 }
                 save();
                 handler.handleMessage(envelope, content, exception);
                 if (exception == null || !(exception instanceof org.whispersystems.libsignal.UntrustedIdentityException)) {

+                    File cacheFile = null;

                     try {
                     try {

-                        File cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp());
-                        cacheFile.delete();
+                        cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp());
+                        Files.delete(cacheFile.toPath());
+                        // Try to delete directory if empty
+                        new File(getMessageCachePath()).delete();

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

-                        // Ignoring
-                        return;
+                        System.err.println("Failed to delete cached message file “" + cacheFile + "”: " + e.getMessage());

                     }
                 }
             }
         } finally {
                     }
                 }
             }
         } finally {

-            if (messagePipe != null)
+            if (messagePipe != null) {

                 messagePipe.shutdown();
                 messagePipe.shutdown();

+                messagePipe = null;
+            }

         }
     }
 
         }
     }
 

-    private void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content) {
+    private void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, boolean ignoreAttachments) {

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

-                handleSignalServiceDataMessage(message, false, envelope.getSource(), username);
+                handleSignalServiceDataMessage(message, false, envelope.getSource(), username, ignoreAttachments);

             }
             if (content.getSyncMessage().isPresent()) {
             }
             if (content.getSyncMessage().isPresent()) {

+                isMultiDevice = true;

                 SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
                 if (syncMessage.getSent().isPresent()) {
                     SignalServiceDataMessage message = syncMessage.getSent().get().getMessage();
                 SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
                 if (syncMessage.getSent().isPresent()) {
                     SignalServiceDataMessage message = syncMessage.getSent().get().getMessage();

-                    handleSignalServiceDataMessage(message, true, envelope.getSource(), syncMessage.getSent().get().getDestination().get());
+                    handleSignalServiceDataMessage(message, true, envelope.getSource(), syncMessage.getSent().get().getDestination().get(), ignoreAttachments);

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


@@ -995,49 +1269,108 @@ class Manager implements Signal {
                     }
                 }
                 if (syncMessage.getGroups().isPresent()) {
                     }
                 }
                 if (syncMessage.getGroups().isPresent()) {

+                    File tmpFile = null;

                     try {
                     try {

-                        DeviceGroupsInputStream s = new DeviceGroupsInputStream(retrieveAttachmentAsStream(syncMessage.getGroups().get().asPointer()));
-                        DeviceGroup g;
-                        while ((g = s.read()) != null) {
-                            GroupInfo syncGroup = groupStore.getGroup(g.getId());
-                            if (syncGroup == null) {
-                                syncGroup = new GroupInfo(g.getId());
-                            }
-                            if (g.getName().isPresent()) {
-                                syncGroup.name = g.getName().get();
-                            }
-                            syncGroup.members.addAll(g.getMembers());
-                            syncGroup.active = g.isActive();
-
-                            if (g.getAvatar().isPresent()) {
-                                retrieveGroupAvatarAttachment(g.getAvatar().get(), syncGroup.groupId);
+                        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 = groupStore.getGroup(g.getId());
+                                if (syncGroup == null) {
+                                    syncGroup = new GroupInfo(g.getId());
+                                }
+                                if (g.getName().isPresent()) {
+                                    syncGroup.name = g.getName().get();
+                                }
+                                syncGroup.members.addAll(g.getMembers());
+                                syncGroup.active = g.isActive();
+                                if (g.getColor().isPresent()) {
+                                    syncGroup.color = g.getColor().get();
+                                }
+
+                                if (g.getAvatar().isPresent()) {
+                                    retrieveGroupAvatarAttachment(g.getAvatar().get(), syncGroup.groupId);
+                                }
+                                groupStore.updateGroup(syncGroup);

                             }
                             }

-                            groupStore.updateGroup(syncGroup);

                         }
                     } catch (Exception e) {
                         e.printStackTrace();
                         }
                     } 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()) {
+                        // TODO store list of blocked numbers

                     }
                 }
                 if (syncMessage.getContacts().isPresent()) {
                     }
                 }
                 if (syncMessage.getContacts().isPresent()) {

+                    File tmpFile = null;

                     try {
                     try {

-                        DeviceContactsInputStream s = new DeviceContactsInputStream(retrieveAttachmentAsStream(syncMessage.getContacts().get().asPointer()));
-                        DeviceContact c;
-                        while ((c = s.read()) != null) {
-                            ContactInfo contact = new ContactInfo();
-                            contact.number = c.getNumber();
-                            if (c.getName().isPresent()) {
-                                contact.name = c.getName().get();
+                        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()) {
+                                contactStore.clear();

                             }
                             }

-                            contactStore.updateContact(contact);
-
-                            if (c.getAvatar().isPresent()) {
-                                retrieveContactAvatarAttachment(c.getAvatar().get(), contact.number);
+                            DeviceContact c;
+                            while ((c = s.read()) != null) {
+                                ContactInfo contact = contactStore.getContact(c.getNumber());
+                                if (contact == null) {
+                                    contact = new ContactInfo();
+                                    contact.number = c.getNumber();
+                                }
+                                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());
+                                }
+                                if (c.getVerified().isPresent()) {
+                                    final VerifiedMessage verifiedMessage = c.getVerified().get();
+                                    signalProtocolStore.saveIdentity(verifiedMessage.getDestination(), verifiedMessage.getIdentityKey(), TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
+                                }
+                                if (c.getExpirationTimer().isPresent()) {
+                                    ThreadInfo thread = threadStore.getThread(c.getNumber());
+                                    thread.messageExpirationTime = c.getExpirationTimer().get();
+                                    threadStore.updateThread(thread);
+                                }
+                                if (c.isBlocked()) {
+                                    // TODO store list of blocked numbers
+                                }
+                                contactStore.updateContact(contact);
+
+                                if (c.getAvatar().isPresent()) {
+                                    retrieveContactAvatarAttachment(c.getAvatar().get(), contact.number);
+                                }

                             }
                         }
                     } catch (Exception e) {
                         e.printStackTrace();
                             }
                         }
                     } 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();
+                    signalProtocolStore.saveIdentity(verifiedMessage.getDestination(), verifiedMessage.getIdentityKey(), TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
+                }

             }
         }
     }
             }
         }
     }


@@ -1046,13 +1379,16 @@ class Manager implements Signal {
         try (FileInputStream f = new FileInputStream(file)) {
             DataInputStream in = new DataInputStream(f);
             int version = in.readInt();
         try (FileInputStream f = new FileInputStream(file)) {
             DataInputStream in = new DataInputStream(f);
             int version = in.readInt();

-            if (version != 1) {
+            if (version > 2) {

                 return null;
             }
             int type = in.readInt();
             String source = in.readUTF();
             int sourceDevice = in.readInt();
                 return null;
             }
             int type = in.readInt();
             String source = in.readUTF();
             int sourceDevice = in.readInt();

-            String relay = in.readUTF();
+            if (version == 1) {
+                // read legacy relay field
+                in.readUTF();
+            }

             long timestamp = in.readLong();
             byte[] content = null;
             int contentLen = in.readInt();
             long timestamp = in.readLong();
             byte[] content = null;
             int contentLen = in.readInt();


@@ -1066,32 +1402,43 @@ class Manager implements Signal {
                 legacyMessage = new byte[legacyMessageLen];
                 in.readFully(legacyMessage);
             }
                 legacyMessage = new byte[legacyMessageLen];
                 in.readFully(legacyMessage);
             }

-            return new SignalServiceEnvelope(type, source, sourceDevice, relay, timestamp, legacyMessage, content);
+            long serverTimestamp = 0;
+            String uuid = null;
+            if (version == 2) {
+                serverTimestamp = in.readLong();
+                uuid = in.readUTF();
+                if ("".equals(uuid)) {
+                    uuid = null;
+                }
+            }
+            return new SignalServiceEnvelope(type, source, sourceDevice, timestamp, legacyMessage, content, serverTimestamp, uuid);

         }
     }
 
     private void storeEnvelope(SignalServiceEnvelope envelope, File file) throws IOException {
         try (FileOutputStream f = new FileOutputStream(file)) {
         }
     }
 
     private void storeEnvelope(SignalServiceEnvelope envelope, File file) throws IOException {
         try (FileOutputStream f = new FileOutputStream(file)) {

-            DataOutputStream out = new DataOutputStream(f);
-            out.writeInt(1); // version
-            out.writeInt(envelope.getType());
-            out.writeUTF(envelope.getSource());
-            out.writeInt(envelope.getSourceDevice());
-            out.writeUTF(envelope.getRelay());
-            out.writeLong(envelope.getTimestamp());
-            if (envelope.hasContent()) {
-                out.writeInt(envelope.getContent().length);
-                out.write(envelope.getContent());
-            } else {
-                out.writeInt(0);
-            }
-            if (envelope.hasLegacyMessage()) {
-                out.writeInt(envelope.getLegacyMessage().length);
-                out.write(envelope.getLegacyMessage());
-            } else {
-                out.writeInt(0);
+            try (DataOutputStream out = new DataOutputStream(f)) {
+                out.writeInt(2); // version
+                out.writeInt(envelope.getType());
+                out.writeUTF(envelope.getSource());
+                out.writeInt(envelope.getSourceDevice());
+                out.writeLong(envelope.getTimestamp());
+                if (envelope.hasContent()) {
+                    out.writeInt(envelope.getContent().length);
+                    out.write(envelope.getContent());
+                } else {
+                    out.writeInt(0);
+                }
+                if (envelope.hasLegacyMessage()) {
+                    out.writeInt(envelope.getLegacyMessage().length);
+                    out.write(envelope.getLegacyMessage());
+                } else {
+                    out.writeInt(0);
+                }
+                out.writeLong(envelope.getServerTimestamp());
+                String uuid = envelope.getUuid();
+                out.writeUTF(uuid == null ? "" : uuid);

             }
             }

-            out.close();

         }
     }
 
         }
     }
 


@@ -1100,7 +1447,7 @@ class Manager implements Signal {
     }
 
     private File retrieveContactAvatarAttachment(SignalServiceAttachment attachment, String number) throws IOException, InvalidMessageException {
     }
 
     private File retrieveContactAvatarAttachment(SignalServiceAttachment attachment, String number) throws IOException, InvalidMessageException {

-        createPrivateDirectories(avatarsPath);
+        IOUtils.createPrivateDirectories(avatarsPath);

         if (attachment.isPointer()) {
             SignalServiceAttachmentPointer pointer = attachment.asPointer();
             return retrieveAttachment(pointer, getContactAvatarFile(number), false);
         if (attachment.isPointer()) {
             SignalServiceAttachmentPointer pointer = attachment.asPointer();
             return retrieveAttachment(pointer, getContactAvatarFile(number), false);


@@ -1115,7 +1462,7 @@ class Manager implements Signal {
     }
 
     private File retrieveGroupAvatarAttachment(SignalServiceAttachment attachment, byte[] groupId) throws IOException, InvalidMessageException {
     }
 
     private File retrieveGroupAvatarAttachment(SignalServiceAttachment attachment, byte[] groupId) throws IOException, InvalidMessageException {

-        createPrivateDirectories(avatarsPath);
+        IOUtils.createPrivateDirectories(avatarsPath);

         if (attachment.isPointer()) {
             SignalServiceAttachmentPointer pointer = attachment.asPointer();
             return retrieveAttachment(pointer, getGroupAvatarFile(groupId), false);
         if (attachment.isPointer()) {
             SignalServiceAttachmentPointer pointer = attachment.asPointer();
             return retrieveAttachment(pointer, getGroupAvatarFile(groupId), false);


@@ -1130,16 +1477,14 @@ class Manager implements Signal {
     }
 
     private File retrieveAttachment(SignalServiceAttachmentPointer pointer) throws IOException, InvalidMessageException {
     }
 
     private File retrieveAttachment(SignalServiceAttachmentPointer pointer) throws IOException, InvalidMessageException {

-        createPrivateDirectories(attachmentsPath);
+        IOUtils.createPrivateDirectories(attachmentsPath);

         return retrieveAttachment(pointer, getAttachmentFile(pointer.getId()), true);
     }
 
     private File retrieveAttachment(SignalServiceAttachmentStream stream, File outputFile) throws IOException, InvalidMessageException {
         InputStream input = stream.getInputStream();
 
         return retrieveAttachment(pointer, getAttachmentFile(pointer.getId()), true);
     }
 
     private File retrieveAttachment(SignalServiceAttachmentStream stream, File outputFile) throws IOException, InvalidMessageException {
         InputStream input = stream.getInputStream();
 

-        OutputStream output = null;
-        try {
-            output = new FileOutputStream(outputFile);
+        try (OutputStream output = new FileOutputStream(outputFile)) {

             byte[] buffer = new byte[4096];
             int read;
 
             byte[] buffer = new byte[4096];
             int read;
 


@@ -1149,10 +1494,6 @@ class Manager implements Signal {
         } catch (FileNotFoundException e) {
             e.printStackTrace();
             return null;
         } catch (FileNotFoundException e) {
             e.printStackTrace();
             return null;

-        } finally {
-            if (output != null) {
-                output.close();
-            }

         }
         return outputFile;
     }
         }
         return outputFile;
     }


@@ -1160,55 +1501,43 @@ class Manager implements Signal {
     private File retrieveAttachment(SignalServiceAttachmentPointer pointer, File outputFile, boolean storePreview) throws IOException, InvalidMessageException {
         if (storePreview && pointer.getPreview().isPresent()) {
             File previewFile = new File(outputFile + ".preview");
     private File retrieveAttachment(SignalServiceAttachmentPointer pointer, File outputFile, boolean storePreview) throws IOException, InvalidMessageException {
         if (storePreview && pointer.getPreview().isPresent()) {
             File previewFile = new File(outputFile + ".preview");

-            OutputStream output = null;
-            try {
-                output = new FileOutputStream(previewFile);
+            try (OutputStream output = new FileOutputStream(previewFile)) {

                 byte[] preview = pointer.getPreview().get();
                 output.write(preview, 0, preview.length);
             } catch (FileNotFoundException e) {
                 e.printStackTrace();
                 return null;
                 byte[] preview = pointer.getPreview().get();
                 output.write(preview, 0, preview.length);
             } catch (FileNotFoundException e) {
                 e.printStackTrace();
                 return null;

-            } finally {
-                if (output != null) {
-                    output.close();
-                }

             }
         }
 
             }
         }
 

-        final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(URL, TRUST_STORE, username, password, deviceId, signalingKey, USER_AGENT);
+        final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceConfiguration, username, password, deviceId, signalingKey, USER_AGENT, null, timer);

 
 

-        File tmpFile = File.createTempFile("ts_attach_" + pointer.getId(), ".tmp");
-        InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile);
+        File tmpFile = IOUtils.createTempFile();
+        try (InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile, MAX_ATTACHMENT_SIZE)) {
+            try (OutputStream output = new FileOutputStream(outputFile)) {
+                byte[] buffer = new byte[4096];
+                int read;

 
 

-        OutputStream output = null;
-        try {
-            output = new FileOutputStream(outputFile);
-            byte[] buffer = new byte[4096];
-            int read;
-
-            while ((read = input.read(buffer)) != -1) {
-                output.write(buffer, 0, read);
+                while ((read = input.read(buffer)) != -1) {
+                    output.write(buffer, 0, read);
+                }
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+                return null;

             }
             }

-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-            return null;

         } finally {
         } finally {

-            if (output != null) {
-                output.close();
-            }
-            if (!tmpFile.delete()) {
-                System.err.println("Failed to delete temp file: " + tmpFile);
+            try {
+                Files.delete(tmpFile.toPath());
+            } catch (IOException e) {
+                System.err.println("Failed to delete received attachment temp file “" + tmpFile + "”: " + e.getMessage());

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

-    private InputStream retrieveAttachmentAsStream(SignalServiceAttachmentPointer pointer) throws IOException, InvalidMessageException {
-        final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(URL, TRUST_STORE, username, password, deviceId, signalingKey, USER_AGENT);
-        File file = File.createTempFile("ts_tmp", "tmp");
-        file.deleteOnExit();
-
-        return messageReceiver.retrieveAttachment(pointer, file);
+    private InputStream retrieveAttachmentAsStream(SignalServiceAttachmentPointer pointer, File tmpFile) throws IOException, InvalidMessageException {
+        final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceConfiguration, username, password, deviceId, signalingKey, USER_AGENT, null, timer);
+        return messageReceiver.retrieveAttachment(pointer, tmpFile, MAX_ATTACHMENT_SIZE);

     }
 
     private String canonicalizeNumber(String number) throws InvalidNumberException {
     }
 
     private String canonicalizeNumber(String number) throws InvalidNumberException {


@@ -1227,64 +1556,95 @@ class Manager implements Signal {
     }
 
     private void sendGroups() throws IOException, UntrustedIdentityException {
     }
 
     private void sendGroups() throws IOException, UntrustedIdentityException {

-        File groupsFile = File.createTempFile("multidevice-group-update", ".tmp");
+        File groupsFile = IOUtils.createTempFile();

 
         try {
 
         try {

-            DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(new FileOutputStream(groupsFile));
-            try {
+            try (OutputStream fos = new FileOutputStream(groupsFile)) {
+                DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(fos);

                 for (GroupInfo record : groupStore.getGroups()) {
                 for (GroupInfo record : groupStore.getGroups()) {

+                    ThreadInfo info = threadStore.getThread(Base64.encodeBytes(record.groupId));

                     out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name),
                             new ArrayList<>(record.members), createGroupAvatarAttachment(record.groupId),
                     out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name),
                             new ArrayList<>(record.members), createGroupAvatarAttachment(record.groupId),

-                            record.active));
+                            record.active, Optional.fromNullable(info != null ? info.messageExpirationTime : null),
+                            Optional.fromNullable(record.color), false));

                 }
                 }

-            } finally {
-                out.close();

             }
 
             if (groupsFile.exists() && groupsFile.length() > 0) {
             }
 
             if (groupsFile.exists() && groupsFile.length() > 0) {

-                FileInputStream contactsFileStream = new FileInputStream(groupsFile);
-                SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
-                        .withStream(contactsFileStream)
-                        .withContentType("application/octet-stream")
-                        .withLength(groupsFile.length())
-                        .build();
-
-                sendMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
+                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 {
             }
         } finally {

-            groupsFile.delete();
+            try {
+                Files.delete(groupsFile.toPath());
+            } catch (IOException e) {
+                System.err.println("Failed to delete groups temp file “" + groupsFile + "”: " + e.getMessage());
+            }

         }
     }
 
     private void sendContacts() throws IOException, UntrustedIdentityException {
         }
     }
 
     private void sendContacts() throws IOException, UntrustedIdentityException {

-        File contactsFile = File.createTempFile("multidevice-contact-update", ".tmp");
+        File contactsFile = IOUtils.createTempFile();

 
         try {
 
         try {

-            DeviceContactsOutputStream out = new DeviceContactsOutputStream(new FileOutputStream(contactsFile));
-            try {
+            try (OutputStream fos = new FileOutputStream(contactsFile)) {
+                DeviceContactsOutputStream out = new DeviceContactsOutputStream(fos);

                 for (ContactInfo record : contactStore.getContacts()) {
                 for (ContactInfo record : contactStore.getContacts()) {

+                    VerifiedMessage verifiedMessage = null;
+                    ThreadInfo info = threadStore.getThread(record.number);
+                    if (getIdentities().containsKey(record.number)) {
+                        JsonIdentityKeyStore.Identity currentIdentity = null;
+                        for (JsonIdentityKeyStore.Identity id : getIdentities().get(record.number)) {
+                            if (currentIdentity == null || id.getDateAdded().after(currentIdentity.getDateAdded())) {
+                                currentIdentity = id;
+                            }
+                        }
+                        if (currentIdentity != null) {
+                            verifiedMessage = new VerifiedMessage(record.number, currentIdentity.getIdentityKey(), currentIdentity.getTrustLevel().toVerifiedState(), currentIdentity.getDateAdded().getTime());
+                        }
+                    }
+
+                    byte[] profileKey = record.profileKey == null ? null : Base64.decode(record.profileKey);
+                    // TODO store list of blocked numbers
+                    boolean blocked = false;

                     out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),
                     out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),

-                            createContactAvatarAttachment(record.number)));
+                            createContactAvatarAttachment(record.number), Optional.fromNullable(record.color),
+                            Optional.fromNullable(verifiedMessage), Optional.fromNullable(profileKey), blocked, Optional.fromNullable(info != null ? info.messageExpirationTime : null)));

                 }
                 }

-            } finally {
-                out.close();

             }
 
             if (contactsFile.exists() && contactsFile.length() > 0) {
             }
 
             if (contactsFile.exists() && contactsFile.length() > 0) {

-                FileInputStream contactsFileStream = new FileInputStream(contactsFile);
-                SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
-                        .withStream(contactsFileStream)
-                        .withContentType("application/octet-stream")
-                        .withLength(contactsFile.length())
-                        .build();
-
-                sendMessage(SignalServiceSyncMessage.forContacts(attachmentStream));
+                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 {
             }
         } finally {

-            contactsFile.delete();
+            try {
+                Files.delete(contactsFile.toPath());
+            } catch (IOException e) {
+                System.err.println("Failed to delete contacts temp file “" + contactsFile + "”: " + e.getMessage());
+            }

         }
     }
 
         }
     }
 

+    private void sendVerifiedMessage(String destination, IdentityKey identityKey, TrustLevel trustLevel) throws IOException, UntrustedIdentityException {
+        VerifiedMessage verifiedMessage = new VerifiedMessage(destination, identityKey, trustLevel.toVerifiedState(), System.currentTimeMillis());
+        sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
+    }
+

     public ContactInfo getContact(String number) {
         return contactStore.getContact(number);
     }
     public ContactInfo getContact(String number) {
         return contactStore.getContact(number);
     }


@@ -1313,11 +1673,44 @@ class Manager implements Signal {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {

-            if (!Arrays.equals(id.identityKey.serialize(), fingerprint)) {
+            if (!Arrays.equals(id.getIdentityKey().serialize(), fingerprint)) {
+                continue;
+            }
+
+            signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+            try {
+                sendVerifiedMessage(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+            } catch (IOException | UntrustedIdentityException e) {
+                e.printStackTrace();
+            }
+            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) {
+        List<JsonIdentityKeyStore.Identity> ids = signalProtocolStore.getIdentities(name);
+        if (ids == null) {
+            return false;
+        }
+        for (JsonIdentityKeyStore.Identity id : ids) {
+            if (!safetyNumber.equals(computeSafetyNumber(name, id.getIdentityKey()))) {

                 continue;
             }
 
                 continue;
             }
 

-            signalProtocolStore.saveIdentity(name, id.identityKey, TrustLevel.TRUSTED_VERIFIED);
+            signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+            try {
+                sendVerifiedMessage(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);
+            } catch (IOException | UntrustedIdentityException e) {
+                e.printStackTrace();
+            }

             save();
             return true;
         }
             save();
             return true;
         }


@@ -1335,11 +1728,21 @@ class Manager implements Signal {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {

-            if (id.trustLevel == TrustLevel.UNTRUSTED) {
-                signalProtocolStore.saveIdentity(name, id.identityKey, TrustLevel.TRUSTED_UNVERIFIED);
+            if (id.getTrustLevel() == TrustLevel.UNTRUSTED) {
+                signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);
+                try {
+                    sendVerifiedMessage(name, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);
+                } catch (IOException | UntrustedIdentityException e) {
+                    e.printStackTrace();
+                }

             }
         }
         save();
         return true;
     }
             }
         }
         save();
         return true;
     }

+
+    public String computeSafetyNumber(String theirUsername, IdentityKey theirIdentityKey) {
+        Fingerprint fingerprint = new NumericFingerprintGenerator(5200).createFor(username, getIdentity(), theirUsername, theirIdentityKey);
+        return fingerprint.getDisplayableFingerprint().getDisplayText();
+    }

 }
 }