]> nmode's Git Repositories - signal-cli/blobdiff - src/main/java/org/asamk/signal/Manager.java
Cleanup
[signal-cli] / src / main / java / org / asamk / signal / Manager.java
index 69800a82948938f2c8f889a2f0178767001896a4..42f5ba859a8cebd3ba62367afa2fb5aa2bbe3bc8 100644 (file)
@@ -31,8 +31,9 @@ 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.SignalProtocolStore;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.util.KeyHelper;
 import org.whispersystems.libsignal.util.Medium;
@@ -45,10 +46,10 @@ import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
 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.AuthorizationFailedException;
-import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
+import org.whispersystems.signalservice.api.push.exceptions.*;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
@@ -62,12 +63,17 @@ 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.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
 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";
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
@@ -87,7 +93,7 @@ class Manager implements Signal {
     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 password;
@@ -97,7 +103,7 @@ class Manager implements Signal {
 
     private boolean registered = false;
 
-    private SignalProtocolStore signalProtocolStore;
+    private JsonSignalProtocolStore signalProtocolStore;
     private SignalServiceAccountManager accountManager;
     private JsonGroupStore groupStore;
     private JsonContactsStore contactStore;
@@ -109,27 +115,64 @@ class Manager implements Signal {
         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;
     }
 
+    private IdentityKey getIdentity() {
+        return signalProtocolStore.getIdentityKeyPair().getPublicKey();
+    }
+
     public int getDeviceId() {
         return deviceId;
     }
 
     public String getFileName() {
-        new File(dataPath).mkdirs();
         return dataPath + "/" + username;
     }
 
+    private String getMessageCachePath() {
+        return this.dataPath + "/" + username + ".d/msg-cache";
+    }
+
+    private String getMessageCachePath(String sender) {
+        return getMessageCachePath() + "/" + sender.replace("/", "_");
+    }
+
+    private File getMessageCacheFile(String sender, long now, long timestamp) throws IOException {
+        String cachePath = getMessageCachePath(sender);
+        createPrivateDirectories(cachePath);
+        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;
@@ -155,6 +198,10 @@ class Manager implements Signal {
         if (fileChannel != null)
             return;
 
+        createPrivateDirectories(dataPath);
+        if (!new File(getFileName()).exists()) {
+            createPrivateFile(getFileName());
+        }
         fileChannel = new RandomAccessFile(new File(getFileName()), "rw").getChannel();
         lock = fileChannel.tryLock();
         if (lock == null) {
@@ -164,9 +211,25 @@ class Manager implements Signal {
         }
     }
 
-    public void load() throws IOException, InvalidKeyException {
+    public void init() throws IOException {
+        load();
+
+        migrateLegacyConfigs();
+
+        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 load() throws IOException {
         openFileChannel();
-        JsonNode rootNode = jsonProcessot.readTree(Channels.newInputStream(fileChannel));
+        JsonNode rootNode = jsonProcessor.readTree(Channels.newInputStream(fileChannel));
 
         JsonNode node = rootNode.get("deviceId");
         if (node != null) {
@@ -187,58 +250,51 @@ class Manager implements Signal {
         } else {
             nextSignedPreKeyId = 0;
         }
-        signalProtocolStore = jsonProcessot.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonSignalProtocolStore.class);
+        signalProtocolStore = jsonProcessor.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonSignalProtocolStore.class);
         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();
         }
+
+        JsonNode contactStoreNode = rootNode.get("contactStore");
+        if (contactStoreNode != null) {
+            contactStore = jsonProcessor.convertValue(contactStoreNode, JsonContactsStore.class);
+        }
+        if (contactStore == null) {
+            contactStore = new JsonContactsStore();
+        }
+    }
+
+    private void migrateLegacyConfigs() {
         // 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 {
-                        new File(avatarsPath).mkdirs();
+                        createPrivateDirectories(avatarsPath);
                         Files.copy(attachmentFile.toPath(), avatarFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
                     } catch (Exception e) {
                         // Ignore
                     }
                 }
             }
-            groupStore.groupsWithLegacyAvatarId.clear();
+            JsonGroupStore.groupsWithLegacyAvatarId.clear();
             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;
         }
-        ObjectNode rootNode = jsonProcessot.createObjectNode();
+        ObjectNode rootNode = jsonProcessor.createObjectNode();
         rootNode.put("username", username)
                 .put("deviceId", deviceId)
                 .put("password", password)
@@ -253,7 +309,7 @@ class Manager implements Signal {
         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) {
@@ -274,12 +330,12 @@ class Manager implements Signal {
         return registered;
     }
 
-    public void register(boolean voiceVerication) throws IOException {
+    public void register(boolean voiceVerification) throws IOException {
         password = Util.getSecret(18);
 
         accountManager = new SignalServiceAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
 
-        if (voiceVerication)
+        if (voiceVerification)
             accountManager.requestVoiceVerificationCode();
         else
             accountManager.requestSmsVerificationCode();
@@ -465,6 +521,9 @@ class Manager implements Signal {
         InputStream attachmentStream = new FileInputStream(attachmentFile);
         final long attachmentSize = attachmentFile.length();
         String mime = Files.probeContentType(attachmentFile.toPath());
+        if (mime == null) {
+            mime = "application/octet-stream";
+        }
         return new SignalServiceAttachmentStream(attachmentStream, mime, attachmentSize, null);
     }
 
@@ -486,10 +545,23 @@ class Manager implements Signal {
         return Optional.of(createAttachment(file));
     }
 
+    private GroupInfo getGroupForSending(byte[] groupId) throws GroupNotFoundException, NotAGroupMemberException {
+        GroupInfo g = groupStore.getGroup(groupId);
+        if (g == null) {
+            throw new GroupNotFoundException(groupId);
+        }
+        for (String member : g.members) {
+            if (member.equals(this.username)) {
+                return g;
+            }
+        }
+        throw new NotAGroupMemberException(groupId, g.name);
+    }
+
     @Override
     public void sendGroupMessage(String messageText, List<String> attachments,
                                  byte[] groupId)
-            throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, UntrustedIdentityException {
+            throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
         if (attachments != null) {
             messageBuilder.withAttachments(getSignalServiceAttachments(attachments));
@@ -502,10 +574,7 @@ class Manager implements Signal {
         }
         SignalServiceDataMessage message = messageBuilder.build();
 
-        GroupInfo g = groupStore.getGroup(groupId);
-        if (g == null) {
-            throw new GroupNotFoundException(groupId);
-        }
+        final GroupInfo g = getGroupForSending(groupId);
 
         // Don't send group message to ourself
         final List<String> membersSend = new ArrayList<>(g.members);
@@ -513,7 +582,7 @@ class Manager implements Signal {
         sendMessage(message, membersSend);
     }
 
-    public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions, UntrustedIdentityException {
+    public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions {
         SignalServiceGroup group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.QUIT)
                 .withId(groupId)
                 .build();
@@ -522,27 +591,33 @@ class Manager implements Signal {
                 .asGroupMessage(group)
                 .build();
 
-        final GroupInfo g = groupStore.getGroup(groupId);
-        if (g == null) {
-            throw new GroupNotFoundException(groupId);
-        }
+        final GroupInfo g = getGroupForSending(groupId);
         g.members.remove(this.username);
         groupStore.updateGroup(g);
 
         sendMessage(message, g.members);
     }
 
-    public byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection<String> members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, UntrustedIdentityException {
+    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();
+    }
+
+    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.members.add(username);
         } else {
-            g = groupStore.getGroup(groupId);
-            if (g == null) {
-                throw new GroupNotFoundException(groupId);
-            }
+            g = getGroupForSending(groupId);
         }
 
         if (name != null) {
@@ -550,14 +625,30 @@ class Manager implements Signal {
         }
 
         if (members != null) {
+            Set<String> newMembers = new HashSet<>();
             for (String member : members) {
                 try {
-                    g.members.add(canonicalizeNumber(member));
+                    member = canonicalizeNumber(member);
                 } catch (InvalidNumberException e) {
                     System.err.println("Failed to add member \"" + member + "\" to group: " + e.getMessage());
                     System.err.println("Aborting…");
                     System.exit(1);
                 }
+                if (g.members.contains(member)) {
+                    continue;
+                }
+                newMembers.add(member);
+                g.members.add(member);
+            }
+            final List<ContactTokenDetails> contacts = accountManager.getContacts(newMembers);
+            if (contacts.size() != newMembers.size()) {
+                // Some of the new members are not registered on Signal
+                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("Aborting…");
+                System.exit(1);
             }
         }
 
@@ -568,7 +659,7 @@ class Manager implements Signal {
 
         File aFile = getGroupAvatarFile(g.groupId);
         if (avatarFile != null) {
-            new File(avatarsPath).mkdirs();
+            createPrivateDirectories(avatarsPath);
             Files.copy(Paths.get(avatarFile), aFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
         }
         if (aFile.exists()) {
@@ -594,7 +685,7 @@ class Manager implements Signal {
 
     @Override
     public void sendMessage(String message, List<String> attachments, String recipient)
-            throws EncapsulatedExceptions, AttachmentInvalidException, IOException, UntrustedIdentityException {
+            throws EncapsulatedExceptions, AttachmentInvalidException, IOException {
         List<String> recipients = new ArrayList<>(1);
         recipients.add(recipient);
         sendMessage(message, attachments, recipients);
@@ -603,7 +694,7 @@ class Manager implements Signal {
     @Override
     public void sendMessage(String messageText, List<String> attachments,
                             List<String> recipients)
-            throws IOException, EncapsulatedExceptions, AttachmentInvalidException, UntrustedIdentityException {
+            throws IOException, EncapsulatedExceptions, AttachmentInvalidException {
         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
         if (attachments != null) {
             messageBuilder.withAttachments(getSignalServiceAttachments(attachments));
@@ -614,7 +705,7 @@ class Manager implements Signal {
     }
 
     @Override
-    public void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions, UntrustedIdentityException {
+    public void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions {
         SignalServiceDataMessage message = SignalServiceDataMessage.newBuilder()
                 .asEndSessionMessage()
                 .build();
@@ -627,8 +718,6 @@ class Manager implements Signal {
         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendMessage(message);
-        } catch (EncapsulatedExceptions encapsulatedExceptions) {
-            encapsulatedExceptions.printStackTrace();
         } catch (UntrustedIdentityException e) {
             e.printStackTrace();
         }
@@ -639,65 +728,87 @@ class Manager implements Signal {
         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendMessage(message);
-        } catch (EncapsulatedExceptions encapsulatedExceptions) {
-            encapsulatedExceptions.printStackTrace();
         } catch (UntrustedIdentityException e) {
             e.printStackTrace();
         }
     }
 
     private void sendMessage(SignalServiceSyncMessage message)
-            throws IOException, EncapsulatedExceptions, UntrustedIdentityException {
+            throws IOException, UntrustedIdentityException {
         SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
                 deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
-        messageSender.sendMessage(message);
+        try {
+            messageSender.sendMessage(message);
+        } catch (UntrustedIdentityException e) {
+            signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
+            throw e;
+        }
     }
 
     private void sendMessage(SignalServiceDataMessage message, Collection<String> recipients)
-            throws IOException, EncapsulatedExceptions, UntrustedIdentityException {
+            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;
+            }
+        }
+
         try {
             SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
                     deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
 
-            Set<SignalServiceAddress> recipientsTS = new HashSet<>(recipients.size());
-            for (String recipient : recipients) {
+            if (message.getGroupInfo().isPresent()) {
                 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;
+                    messageSender.sendMessage(new ArrayList<>(recipientsTS), message);
+                } catch (EncapsulatedExceptions encapsulatedExceptions) {
+                    for (UntrustedIdentityException e : encapsulatedExceptions.getUntrustedIdentityExceptions()) {
+                        signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
+                    }
                 }
-            }
-
-            if (message.getGroupInfo().isPresent()) {
-                messageSender.sendMessage(new ArrayList<>(recipientsTS), message);
             } 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<>();
                 for (SignalServiceAddress address : recipientsTS) {
-                    messageSender.sendMessage(address, message);
+                    try {
+                        messageSender.sendMessage(address, message);
+                    } 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));
+                    }
+                }
+                if (!untrustedIdentities.isEmpty() || !unregisteredUsers.isEmpty() || !networkExceptions.isEmpty()) {
+                    throw new EncapsulatedExceptions(untrustedIdentities, unregisteredUsers, networkExceptions);
                 }
             }
-
+        } finally {
             if (message.isEndSession()) {
                 for (SignalServiceAddress recipient : recipientsTS) {
                     handleEndSession(recipient.getNumber());
                 }
             }
-        } finally {
             save();
         }
     }
 
-    private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) {
+    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);
         try {
             return cipher.decrypt(envelope);
-        } catch (Exception e) {
-            // TODO handle all exceptions
-            e.printStackTrace();
-            return null;
+        } catch (org.whispersystems.libsignal.UntrustedIdentityException e) {
+            signalProtocolStore.saveIdentity(e.getName(), e.getUntrustedIdentity(), TrustLevel.UNTRUSTED);
+            throw e;
         }
     }
 
@@ -706,7 +817,7 @@ class Manager implements Signal {
     }
 
     public interface ReceiveMessageHandler {
-        void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent decryptedContent);
+        void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent decryptedContent, Throwable e);
     }
 
     private void handleSignalServiceDataMessage(SignalServiceDataMessage message, boolean isSync, String source, String destination) {
@@ -768,7 +879,49 @@ class Manager implements Signal {
         }
     }
 
+    public void retryFailedReceivedMessages(ReceiveMessageHandler handler) {
+        final File cachePath = new File(getMessageCachePath());
+        if (!cachePath.exists()) {
+            return;
+        }
+        for (final File dir : cachePath.listFiles()) {
+            if (!dir.isDirectory()) {
+                continue;
+            }
+
+            String sender = dir.getName();
+            for (final File fileEntry : dir.listFiles()) {
+                if (!fileEntry.isFile()) {
+                    continue;
+                }
+                SignalServiceEnvelope envelope;
+                try {
+                    envelope = loadEnvelope(fileEntry);
+                    if (envelope == null) {
+                        continue;
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    continue;
+                }
+                SignalServiceContent content = null;
+                if (!envelope.isReceipt()) {
+                    try {
+                        content = decryptMessage(envelope);
+                    } catch (Exception e) {
+                        continue;
+                    }
+                    handleMessage(envelope, content);
+                }
+                save();
+                handler.handleMessage(envelope, content, null);
+                fileEntry.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;
 
@@ -778,96 +931,47 @@ class Manager implements Signal {
             while (true) {
                 SignalServiceEnvelope envelope;
                 SignalServiceContent content = null;
+                Exception exception = null;
+                final long now = new Date().getTime();
                 try {
-                    envelope = messagePipe.read(timeoutSeconds, TimeUnit.SECONDS);
-                    if (!envelope.isReceipt()) {
-                        content = decryptMessage(envelope);
-                        if (content != null) {
-                            if (content.getDataMessage().isPresent()) {
-                                SignalServiceDataMessage message = content.getDataMessage().get();
-                                handleSignalServiceDataMessage(message, false, envelope.getSource(), username);
-                            }
-                            if (content.getSyncMessage().isPresent()) {
-                                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());
-                                }
-                                if (syncMessage.getRequest().isPresent()) {
-                                    RequestMessage rm = syncMessage.getRequest().get();
-                                    if (rm.isContactsRequest()) {
-                                        try {
-                                            sendContacts();
-                                        } catch (EncapsulatedExceptions encapsulatedExceptions) {
-                                            encapsulatedExceptions.printStackTrace();
-                                        } catch (UntrustedIdentityException e) {
-                                            e.printStackTrace();
-                                        }
-                                    }
-                                    if (rm.isGroupsRequest()) {
-                                        try {
-                                            sendGroups();
-                                        } catch (EncapsulatedExceptions encapsulatedExceptions) {
-                                            encapsulatedExceptions.printStackTrace();
-                                        } catch (UntrustedIdentityException e) {
-                                            e.printStackTrace();
-                                        }
-                                    }
-                                }
-                                if (syncMessage.getGroups().isPresent()) {
-                                    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);
-                                            }
-                                            groupStore.updateGroup(syncGroup);
-                                        }
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                    }
-                                }
-                                if (syncMessage.getContacts().isPresent()) {
-                                    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();
-                                            }
-                                            contactStore.updateContact(contact);
-
-                                            if (c.getAvatar().isPresent()) {
-                                                retrieveContactAvatarAttachment(c.getAvatar().get(), contact.number);
-                                            }
-                                        }
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                    }
-                                }
+                    envelope = messagePipe.read(timeoutSeconds, TimeUnit.SECONDS, new SignalServiceMessagePipe.MessagePipeCallback() {
+                        @Override
+                        public void onMessage(SignalServiceEnvelope envelope) {
+                            // store message on disk, before acknowledging receipt to the server
+                            try {
+                                File cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp());
+                                storeEnvelope(envelope, cacheFile);
+                            } catch (IOException e) {
+                                System.err.println("Failed to store encrypted message in disk cache, ignoring: " + e.getMessage());
                             }
                         }
-                    }
-                    save();
-                    handler.handleMessage(envelope, content);
+                    });
                 } catch (TimeoutException e) {
                     if (returnOnTimeout)
                         return;
+                    continue;
                 } catch (InvalidVersionException e) {
                     System.err.println("Ignoring error: " + e.getMessage());
+                    continue;
+                }
+                if (!envelope.isReceipt()) {
+                    try {
+                        content = decryptMessage(envelope);
+                    } catch (Exception e) {
+                        exception = e;
+                    }
+                    handleMessage(envelope, content);
+                }
+                save();
+                handler.handleMessage(envelope, content, exception);
+                if (exception == null || !(exception instanceof org.whispersystems.libsignal.UntrustedIdentityException)) {
+                    try {
+                        File cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp());
+                        cacheFile.delete();
+                    } catch (IOException e) {
+                        // Ignoring
+                        return;
+                    }
                 }
             }
         } finally {
@@ -876,12 +980,151 @@ class Manager implements Signal {
         }
     }
 
+    private void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content) {
+        if (content != null) {
+            if (content.getDataMessage().isPresent()) {
+                SignalServiceDataMessage message = content.getDataMessage().get();
+                handleSignalServiceDataMessage(message, false, envelope.getSource(), username);
+            }
+            if (content.getSyncMessage().isPresent()) {
+                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());
+                }
+                if (syncMessage.getRequest().isPresent()) {
+                    RequestMessage rm = syncMessage.getRequest().get();
+                    if (rm.isContactsRequest()) {
+                        try {
+                            sendContacts();
+                        } catch (UntrustedIdentityException | IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    if (rm.isGroupsRequest()) {
+                        try {
+                            sendGroups();
+                        } catch (UntrustedIdentityException | IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+                if (syncMessage.getGroups().isPresent()) {
+                    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);
+                            }
+                            groupStore.updateGroup(syncGroup);
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    if (syncMessage.getBlockedList().isPresent()) {
+                        // TODO store list of blocked numbers
+                    }
+                }
+                if (syncMessage.getContacts().isPresent()) {
+                    try {
+                        DeviceContactsInputStream s = new DeviceContactsInputStream(retrieveAttachmentAsStream(syncMessage.getContacts().get().asPointer()));
+                        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();
+                            }
+                            contactStore.updateContact(contact);
+
+                            if (c.getAvatar().isPresent()) {
+                                retrieveContactAvatarAttachment(c.getAvatar().get(), contact.number);
+                            }
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+
+    private SignalServiceEnvelope loadEnvelope(File file) throws IOException {
+        try (FileInputStream f = new FileInputStream(file)) {
+            DataInputStream in = new DataInputStream(f);
+            int version = in.readInt();
+            if (version != 1) {
+                return null;
+            }
+            int type = in.readInt();
+            String source = in.readUTF();
+            int sourceDevice = in.readInt();
+            String relay = in.readUTF();
+            long timestamp = in.readLong();
+            byte[] content = null;
+            int contentLen = in.readInt();
+            if (contentLen > 0) {
+                content = new byte[contentLen];
+                in.readFully(content);
+            }
+            byte[] legacyMessage = null;
+            int legacyMessageLen = in.readInt();
+            if (legacyMessageLen > 0) {
+                legacyMessage = new byte[legacyMessageLen];
+                in.readFully(legacyMessage);
+            }
+            return new SignalServiceEnvelope(type, source, sourceDevice, relay, timestamp, legacyMessage, content);
+        }
+    }
+
+    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);
+            }
+            out.close();
+        }
+    }
+
     public File getContactAvatarFile(String number) {
         return new File(avatarsPath, "contact-" + number);
     }
 
     private File retrieveContactAvatarAttachment(SignalServiceAttachment attachment, String number) throws IOException, InvalidMessageException {
-        new File(avatarsPath).mkdirs();
+        createPrivateDirectories(avatarsPath);
         if (attachment.isPointer()) {
             SignalServiceAttachmentPointer pointer = attachment.asPointer();
             return retrieveAttachment(pointer, getContactAvatarFile(number), false);
@@ -896,7 +1139,7 @@ class Manager implements Signal {
     }
 
     private File retrieveGroupAvatarAttachment(SignalServiceAttachment attachment, byte[] groupId) throws IOException, InvalidMessageException {
-        new File(avatarsPath).mkdirs();
+        createPrivateDirectories(avatarsPath);
         if (attachment.isPointer()) {
             SignalServiceAttachmentPointer pointer = attachment.asPointer();
             return retrieveAttachment(pointer, getGroupAvatarFile(groupId), false);
@@ -911,7 +1154,7 @@ class Manager implements Signal {
     }
 
     private File retrieveAttachment(SignalServiceAttachmentPointer pointer) throws IOException, InvalidMessageException {
-        new File(attachmentsPath).mkdirs();
+        createPrivateDirectories(attachmentsPath);
         return retrieveAttachment(pointer, getAttachmentFile(pointer.getId()), true);
     }
 
@@ -1007,7 +1250,7 @@ class Manager implements Signal {
         return false;
     }
 
-    private void sendGroups() throws IOException, EncapsulatedExceptions, UntrustedIdentityException {
+    private void sendGroups() throws IOException, UntrustedIdentityException {
         File groupsFile = File.createTempFile("multidevice-group-update", ".tmp");
 
         try {
@@ -1037,7 +1280,7 @@ class Manager implements Signal {
         }
     }
 
-    private void sendContacts() throws IOException, EncapsulatedExceptions, UntrustedIdentityException {
+    private void sendContacts() throws IOException, UntrustedIdentityException {
         File contactsFile = File.createTempFile("multidevice-contact-update", ".tmp");
 
         try {
@@ -1045,7 +1288,7 @@ class Manager implements Signal {
             try {
                 for (ContactInfo record : contactStore.getContacts()) {
                     out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),
-                            createContactAvatarAttachment(record.number)));
+                            createContactAvatarAttachment(record.number), Optional.fromNullable(record.color)));
                 }
             } finally {
                 out.close();
@@ -1073,4 +1316,82 @@ class Manager implements Signal {
     public GroupInfo getGroup(byte[] groupId) {
         return groupStore.getGroup(groupId);
     }
+
+    public Map<String, List<JsonIdentityKeyStore.Identity>> getIdentities() {
+        return signalProtocolStore.getIdentities();
+    }
+
+    public List<JsonIdentityKeyStore.Identity> getIdentities(String number) {
+        return signalProtocolStore.getIdentities(number);
+    }
+
+    /**
+     * Trust this the identity with this fingerprint
+     *
+     * @param name        username of the identity
+     * @param fingerprint Fingerprint
+     */
+    public boolean trustIdentityVerified(String name, byte[] fingerprint) {
+        List<JsonIdentityKeyStore.Identity> ids = signalProtocolStore.getIdentities(name);
+        if (ids == null) {
+            return false;
+        }
+        for (JsonIdentityKeyStore.Identity id : ids) {
+            if (!Arrays.equals(id.identityKey.serialize(), fingerprint)) {
+                continue;
+            }
+
+            signalProtocolStore.saveIdentity(name, id.identityKey, TrustLevel.TRUSTED_VERIFIED);
+            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.identityKey))) {
+                continue;
+            }
+
+            signalProtocolStore.saveIdentity(name, id.identityKey, TrustLevel.TRUSTED_VERIFIED);
+            save();
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Trust all keys of this identity without verification
+     *
+     * @param name username of the identity
+     */
+    public boolean trustIdentityAllKeys(String name) {
+        List<JsonIdentityKeyStore.Identity> ids = signalProtocolStore.getIdentities(name);
+        if (ids == null) {
+            return false;
+        }
+        for (JsonIdentityKeyStore.Identity id : ids) {
+            if (id.trustLevel == TrustLevel.UNTRUSTED) {
+                signalProtocolStore.saveIdentity(name, id.identityKey, TrustLevel.TRUSTED_UNVERIFIED);
+            }
+        }
+        save();
+        return true;
+    }
+
+    public String computeSafetyNumber(String theirUsername, IdentityKey theirIdentityKey) {
+        Fingerprint fingerprint = new NumericFingerprintGenerator(5200).createFor(username, getIdentity(), theirUsername, theirIdentityKey);
+        return fingerprint.getDisplayableFingerprint().getDisplayText();
+    }
 }