Re-order imports to match original structure

[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 d329990dda87ed42ee6644962a8ea650f8bc95d9..b20ca002d4c01a88ea350efdb672c69db68e07bc 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -16,6 +16,10 @@
  */
 package org.asamk.signal;
 
  */
 package org.asamk.signal;
 

+import static java.nio.file.attribute.PosixFilePermission.OWNER_EXECUTE;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
+

 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;


@@ -25,9 +29,67 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;

+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidObjectException;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
+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.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.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+

 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;
 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;

-import org.whispersystems.libsignal.*;
+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.Base64;
+import org.asamk.signal.util.Util;
+import org.whispersystems.libsignal.DuplicateMessageException;
+import org.whispersystems.libsignal.IdentityKey;
+import org.whispersystems.libsignal.IdentityKeyPair;
+import org.whispersystems.libsignal.InvalidKeyException;
+import org.whispersystems.libsignal.InvalidKeyIdException;
+import org.whispersystems.libsignal.InvalidMessageException;
+import org.whispersystems.libsignal.InvalidVersionException;
+import org.whispersystems.libsignal.LegacyMessageException;
+import org.whispersystems.libsignal.NoSessionException;

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


@@ -44,39 +106,39 @@ 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.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 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.messages.SignalServiceAttachment;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
+import org.whispersystems.signalservice.api.messages.SignalServiceContent;
+import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
+import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceContact;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsInputStream;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsOutputStream;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroup;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsInputStream;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsOutputStream;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo;
+import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;

 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.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.PushNetworkException;
+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.internal.push.SignalServiceProtos;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;

-
-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.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.*;
+import org.whispersystems.signalservice.internal.push.SignalServiceUrl;

 
 class Manager implements Signal {
     private final static String URL = "https://textsecure-service.whispersystems.org";
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 
 class Manager implements Signal {
     private final static String URL = "https://textsecure-service.whispersystems.org";
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();

+    private final static SignalServiceUrl[] serviceUrls = new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)};

 
     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();


@@ -108,6 +170,7 @@ class Manager implements Signal {
     private JsonGroupStore groupStore;
     private JsonContactsStore contactStore;
     private JsonThreadStore threadStore;
     private JsonGroupStore groupStore;
     private JsonContactsStore contactStore;
     private JsonThreadStore threadStore;

+    private SignalServiceMessagePipe messagePipe = null;

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


@@ -217,7 +280,7 @@ class Manager implements Signal {
 
         migrateLegacyConfigs();
 
 
         migrateLegacyConfigs();
 

-        accountManager = new SignalServiceAccountManager(URL, TRUST_STORE, username, password, deviceId, USER_AGENT);
+        accountManager = new SignalServiceAccountManager(serviceUrls, username, password, deviceId, USER_AGENT);

         try {
             if (registered && accountManager.getPreKeysCount() < PREKEY_MINIMUM_COUNT) {
                 refreshPreKeys();
         try {
             if (registered && accountManager.getPreKeysCount() < PREKEY_MINIMUM_COUNT) {
                 refreshPreKeys();


@@ -342,7 +405,7 @@ class Manager implements Signal {
     public void register(boolean voiceVerification) throws IOException {
         password = Util.getSecret(18);
 
     public void register(boolean voiceVerification) throws IOException {
         password = Util.getSecret(18);
 

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

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


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

+    public void updateAccountAttributes() throws IOException {
+        accountManager.setAccountAttributes(signalingKey, signalProtocolStore.getLocalRegistrationId(), false, false,true);
+    }
+
+    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 {
         password = Util.getSecret(18);
 
     public URI getDeviceLinkUri() throws TimeoutException, IOException {
         password = Util.getSecret(18);
 

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

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


@@ -493,7 +567,7 @@ class Manager implements Signal {
     public void verifyAccount(String verificationCode) throws IOException {
         verificationCode = verificationCode.replace("-", "");
         signalingKey = Util.getSecret(52);
     public void verifyAccount(String verificationCode) throws IOException {
         verificationCode = verificationCode.replace("-", "");
         signalingKey = Util.getSecret(52);

-        accountManager.verifyAccountWithCode(verificationCode, signalingKey, signalProtocolStore.getLocalRegistrationId(), false, true);
+        accountManager.verifyAccountWithCode(verificationCode, signalingKey, signalProtocolStore.getLocalRegistrationId(), false, false,true);

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


@@ -566,6 +640,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,
 
     @Override
     public void sendGroupMessage(String messageText, List<String> attachments,


@@ -761,6 +839,65 @@ class Manager implements Signal {
         sendMessage(messageBuilder, recipients);
     }
 
         sendMessage(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.out.println("Add contact " + number + " named " + name);
+        } else {
+            System.out.println("Updating contact " + number + " name " + contact.name + " -> " + name);
+        }
+        contact.name = name;
+        contactStore.updateContact(contact);
+        save();
+    }
+
+    @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);
+        }
+    }
+
+    @Override
+    public void updateGroup(byte[] groupId, String name, List<String> members, String avatar) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
+        if (name.isEmpty()) {
+            name = null;
+        }
+        if (members.size() == 0) {
+            members = null;
+        }
+        if (avatar.isEmpty()) {
+            avatar = null;
+        }
+        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));
     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));


@@ -783,8 +920,8 @@ class Manager implements Signal {
 
     private void sendSyncMessage(SignalServiceSyncMessage message)
             throws IOException, UntrustedIdentityException {
 
     private void sendSyncMessage(SignalServiceSyncMessage message)
             throws IOException, UntrustedIdentityException {

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

         try {
             messageSender.sendMessage(message);
         } catch (UntrustedIdentityException e) {
         try {
             messageSender.sendMessage(message);
         } catch (UntrustedIdentityException e) {


@@ -800,8 +937,8 @@ class Manager implements Signal {
 
         SignalServiceDataMessage message = null;
         try {
 
         SignalServiceDataMessage message = null;
         try {

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

 
             message = messageBuilder.build();
             if (message.getGroupInfo().isPresent()) {
 
             message = messageBuilder.build();
             if (message.getGroupInfo().isPresent()) {


@@ -883,7 +1020,7 @@ 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();
         String threadId;
         if (message.getGroupInfo().isPresent()) {
             SignalServiceGroup groupInfo = message.getGroupInfo().get();


@@ -970,7 +1107,7 @@ class Manager implements Signal {
                 threadStore.updateThread(thread);
             }
         }
                 threadStore.updateThread(thread);
             }
         }

-        if (message.getAttachments().isPresent()) {
+        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 {


@@ -983,7 +1120,7 @@ class Manager implements Signal {
         }
     }
 
         }
     }
 

-    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;


@@ -993,7 +1130,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;


@@ -1015,22 +1151,27 @@ 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.out.println("Failed to delete cached message file “" + fileEntry + "”: " + e.getMessage());
+                }

             }
         }
     }
 
             }
         }
     }
 

-    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(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);

 
         try {
 
         try {

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

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


@@ -1038,7 +1179,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


@@ -1064,37 +1205,39 @@ 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());

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

-                        // Ignoring
-                        return;
+                        System.out.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()) {
                 SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
                 if (syncMessage.getSent().isPresent()) {
                     SignalServiceDataMessage message = syncMessage.getSent().get().getMessage();
             }
             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());
+                    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();


@@ -1114,8 +1257,10 @@ 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()));
+                        tmpFile = Util.createTempFile();
+                        DeviceGroupsInputStream s = new DeviceGroupsInputStream(retrieveAttachmentAsStream(syncMessage.getGroups().get().asPointer(), tmpFile));

                         DeviceGroup g;
                         while ((g = s.read()) != null) {
                             GroupInfo syncGroup = groupStore.getGroup(g.getId());
                         DeviceGroup g;
                         while ((g = s.read()) != null) {
                             GroupInfo syncGroup = groupStore.getGroup(g.getId());


@@ -1135,14 +1280,24 @@ class Manager implements Signal {
                         }
                     } catch (Exception e) {
                         e.printStackTrace();
                         }
                     } catch (Exception e) {
                         e.printStackTrace();

+                    } finally {
+                        if (tmpFile != null) {
+                            try {
+                                Files.delete(tmpFile.toPath());
+                            } catch (IOException e) {
+                                System.out.println("Failed to delete temp file “" + tmpFile + "”: " + e.getMessage());
+                            }
+                        }

                     }
                     if (syncMessage.getBlockedList().isPresent()) {
                         // TODO store list of blocked numbers
                     }
                 }
                 if (syncMessage.getContacts().isPresent()) {
                     }
                     if (syncMessage.getBlockedList().isPresent()) {
                         // TODO store list of blocked numbers
                     }
                 }
                 if (syncMessage.getContacts().isPresent()) {

+                    File tmpFile = null;

                     try {
                     try {

-                        DeviceContactsInputStream s = new DeviceContactsInputStream(retrieveAttachmentAsStream(syncMessage.getContacts().get().asPointer()));
+                        tmpFile = Util.createTempFile();
+                        DeviceContactsInputStream s = new DeviceContactsInputStream(retrieveAttachmentAsStream(syncMessage.getContacts().get().asPointer(), tmpFile));

                         DeviceContact c;
                         while ((c = s.read()) != null) {
                             ContactInfo contact = contactStore.getContact(c.getNumber());
                         DeviceContact c;
                         while ((c = s.read()) != null) {
                             ContactInfo contact = contactStore.getContact(c.getNumber());


@@ -1164,6 +1319,14 @@ class Manager implements Signal {
                         }
                     } catch (Exception e) {
                         e.printStackTrace();
                         }
                     } catch (Exception e) {
                         e.printStackTrace();

+                    } finally {
+                        if (tmpFile != null) {
+                            try {
+                                Files.delete(tmpFile.toPath());
+                            } catch (IOException e) {
+                                System.out.println("Failed to delete temp file “" + tmpFile + "”: " + e.getMessage());
+                            }
+                        }

                     }
                 }
             }
                     }
                 }
             }


@@ -1200,26 +1363,26 @@ class Manager implements Signal {
 
     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(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();

         }
     }
 
         }
     }
 


@@ -1265,9 +1428,7 @@ class Manager implements Signal {
     private File retrieveAttachment(SignalServiceAttachmentStream stream, File outputFile) throws IOException, InvalidMessageException {
         InputStream input = stream.getInputStream();
 
     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;
 


@@ -1277,10 +1438,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;
     }


@@ -1288,59 +1445,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);
-
-        File tmpFile = File.createTempFile("ts_attach_" + pointer.getId(), ".tmp");
-        InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile);
+        final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);

 
 

-        OutputStream output = null;
-        try {
-            output = new FileOutputStream(outputFile);
-            byte[] buffer = new byte[4096];
-            int read;
+        File tmpFile = Util.createTempFile();
+        try (InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile)) {
+            try (OutputStream 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();
-            }
-            input.close();

             try {
                 Files.delete(tmpFile.toPath());
             try {
                 Files.delete(tmpFile.toPath());

-            } catch(Exception e) {
-                System.out.println("Failed to delete temp file: " + tmpFile);
-                e.printStackTrace();
+            } catch (IOException e) {
+                System.out.println("Failed to delete 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(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
+        return messageReceiver.retrieveAttachment(pointer, tmpFile);

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


@@ -1359,65 +1500,67 @@ 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 = Util.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()) {
                     out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name),
                             new ArrayList<>(record.members), createGroupAvatarAttachment(record.groupId),
                             record.active));
                 }
                 for (GroupInfo record : groupStore.getGroups()) {
                     out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name),
                             new ArrayList<>(record.members), createGroupAvatarAttachment(record.groupId),
                             record.active));
                 }

-            } finally {
-                out.close();

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

-                FileInputStream contactsFileStream = new FileInputStream(groupsFile);
-                try {
+                try (FileInputStream groupsFileStream = new FileInputStream(groupsFile)) {

                     SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
                     SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()

-                            .withStream(contactsFileStream)
+                            .withStream(groupsFileStream)

                             .withContentType("application/octet-stream")
                             .withLength(groupsFile.length())
                             .build();
 
                     sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
                             .withContentType("application/octet-stream")
                             .withLength(groupsFile.length())
                             .build();
 
                     sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));

-                } finally {
-                    contactsFileStream.close();

                 }
             }
         } finally {
                 }
             }
         } finally {

-            groupsFile.delete();
+            try {
+                Files.delete(groupsFile.toPath());
+            } catch (IOException e) {
+                System.out.println("Failed to delete 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 = Util.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()) {
                     out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),
                             createContactAvatarAttachment(record.number), Optional.fromNullable(record.color)));
                 }
                 for (ContactInfo record : contactStore.getContacts()) {
                     out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),
                             createContactAvatarAttachment(record.number), Optional.fromNullable(record.color)));
                 }

-            } 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();
-
-                sendSyncMessage(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(attachmentStream));
+                }

             }
         } finally {
             }
         } finally {

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

         }
     }
 
         }
     }
 


@@ -1449,11 +1592,11 @@ 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;
             }
 
                 continue;
             }
 

-            signalProtocolStore.saveIdentity(name, id.identityKey, TrustLevel.TRUSTED_VERIFIED);
+            signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);

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


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

-            if (!safetyNumber.equals(computeSafetyNumber(name, id.identityKey))) {
+            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);

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


@@ -1494,8 +1637,8 @@ 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);

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