Bump version to 0.52

// FREEBIE

config/sample.yml

@@ -1,32 +1,16 @@
-twilio:
-  accountId: 
+twilio: # Twilio SMS gateway configuration
+  accountId:
   accountToken:
   number:
   localDomain: # The domain Twilio can call back to.
-  international: # Boolean specifying Twilio for international delivery
 
-# Optional. If specified, Nexmo will be used for non-US SMS and 
-# voice verification if twilio.international is false. Otherwise,
-# Nexmo, if specified, Nexmo will only be used as a fallback
-# for failed Twilio deliveries.
-nexmo:
-  apiKey:
-  apiSecret:
-  number:
+push: # GCM/APN push server configuration
+  host:
+  port:
+  username:
+  password:
 
-gcm:
-  senderId:
-  apiKey: 
-
-# Optional. Only if iOS clients are supported.
-apn:
-  # In PEM format.
-  certificate: 
-  
-  # In PEM format.
-  key: 
-
-s3:
+s3: # AWS S3 configuration
   accessKey: 
   accessSecret: 
 
@@ -35,13 +19,37 @@ s3:
   # correct permissions.
   attachmentsBucket:
 
-memcache:
-  servers: 
-  user: 
-  password: 
+directory: # Redis server configuration for TS directory
+  url:
 
-redis:
-  url: 
+cache: # Redis server configuration for general purpose caching
+  url:
+
+websocket:
+  enabled: true
+
+messageStore: # Postgres database configuration for message store
+  driverClass: org.postgresql.Driver
+  user:
+  password:
+  url:
+
+database: # Postgres database configuration for account store
+  # the name of your JDBC driver
+  driverClass: org.postgresql.Driver
+
+  # the username
+  user:
+
+  # the password
+  password:
+
+  # the JDBC URL
+  url: jdbc:postgresql://somehost:somport/somedb
+
+  # any properties specific to your JDBC driver:
+  properties:
+    charSet: UTF-8
 
 federation:
   name:
@@ -52,24 +60,3 @@ federation:
       authenticationToken: foo
       certificate: in pem format 
 
-# Optional address of graphite server to report metrics
-graphite:
-  host:
-  port:
-
-database:
-  # the name of your JDBC driver
-  driverClass: org.postgresql.Driver
-
-  # the username
-  user: 
-
-  # the password
-  password: 
-
-  # the JDBC URL
-  url: jdbc:postgresql://somehost:somport/somedb
-
-  # any properties specific to your JDBC driver:
-  properties:
-    charSet: UTF-8

pom.xml

@@ -9,7 +9,7 @@
 
     <groupId>org.whispersystems.textsecure</groupId>
     <artifactId>TextSecureServer</artifactId>
-    <version>0.41</version>
+    <version>0.52</version>
 
     <properties>
         <dropwizard.version>0.7.1</dropwizard.version>
@@ -132,7 +132,6 @@
             <version>0.2.3</version>
         </dependency>
 
-
     </dependencies>
 
     <dependencyManagement>

protobuf/Makefile

@@ -1,3 +1,3 @@
 
 all:
-	protoc --java_out=../src/main/java/ OutgoingMessageSignal.proto PubSubMessage.proto
+	protoc --java_out=../src/main/java/ TextSecure.proto PubSubMessage.proto

protobuf/TextSecure.proto

@@ -19,23 +19,22 @@ package textsecure;
 option java_package = "org.whispersystems.textsecuregcm.entities";
 option java_outer_classname = "MessageProtos";
 
-message OutgoingMessageSignal {
+message Envelope {
   enum Type {
     UNKNOWN       = 0;
     CIPHERTEXT    = 1;
     KEY_EXCHANGE  = 2;
     PREKEY_BUNDLE = 3;
-    PLAINTEXT     = 4;
     RECEIPT       = 5;
   }
 
-  optional uint32 type = 1;
-  optional string source = 2;
-  optional  uint32 sourceDevice = 7;
-  optional string relay = 3;
-//  repeated string destinations = 4;
-  optional uint64 timestamp = 5;
-  optional bytes message = 6;
+  optional Type   type          = 1;
+  optional string source        = 2;
+  optional uint32 sourceDevice  = 7;
+  optional string relay         = 3;
+  optional uint64 timestamp     = 5;
+  optional bytes  legacyMessage = 6; // Contains an encrypted DataMessage
+  optional bytes  content       = 8; // Contains an encrypted Content
 }
 
 message ProvisioningUuid {

src/main/java/org/whispersystems/dispatch/DispatchChannel.java

@@ -0,0 +1,7 @@
+package org.whispersystems.dispatch;
+
+public interface DispatchChannel {
+  public void onDispatchMessage(String channel, byte[] message);
+  public void onDispatchSubscribed(String channel);
+  public void onDispatchUnsubscribed(String channel);
+}

src/main/java/org/whispersystems/dispatch/DispatchManager.java

@@ -0,0 +1,172 @@
+package org.whispersystems.dispatch;
+
+import com.google.common.base.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.dispatch.io.RedisPubSubConnectionFactory;
+import org.whispersystems.dispatch.redis.PubSubConnection;
+import org.whispersystems.dispatch.redis.PubSubReply;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+public class DispatchManager extends Thread {
+
+  private final Logger                       logger        = LoggerFactory.getLogger(DispatchManager.class);
+  private final Executor                     executor      = Executors.newCachedThreadPool();
+  private final Map<String, DispatchChannel> subscriptions = new ConcurrentHashMap<>();
+
+  private final Optional<DispatchChannel>    deadLetterChannel;
+  private final RedisPubSubConnectionFactory redisPubSubConnectionFactory;
+
+  private          PubSubConnection pubSubConnection;
+  private volatile boolean          running;
+
+  public DispatchManager(RedisPubSubConnectionFactory redisPubSubConnectionFactory,
+                         Optional<DispatchChannel> deadLetterChannel)
+  {
+    this.redisPubSubConnectionFactory = redisPubSubConnectionFactory;
+    this.deadLetterChannel            = deadLetterChannel;
+  }
+
+  @Override
+  public void start() {
+    this.pubSubConnection = redisPubSubConnectionFactory.connect();
+    this.running          = true;
+    super.start();
+  }
+
+  public void shutdown() {
+    this.running = false;
+    this.pubSubConnection.close();
+  }
+
+  public synchronized void subscribe(String name, DispatchChannel dispatchChannel) {
+    Optional<DispatchChannel> previous = Optional.fromNullable(subscriptions.get(name));
+    subscriptions.put(name, dispatchChannel);
+
+    try {
+      pubSubConnection.subscribe(name);
+    } catch (IOException e) {
+      logger.warn("Subscription error", e);
+    }
+
+    if (previous.isPresent()) {
+      dispatchUnsubscription(name, previous.get());
+    }
+  }
+
+  public synchronized void unsubscribe(String name, DispatchChannel channel) {
+    Optional<DispatchChannel> subscription = Optional.fromNullable(subscriptions.get(name));
+
+    if (subscription.isPresent() && subscription.get() == channel) {
+      subscriptions.remove(name);
+
+      try {
+        pubSubConnection.unsubscribe(name);
+      } catch (IOException e) {
+        logger.warn("Unsubscribe error", e);
+      }
+
+      dispatchUnsubscription(name, subscription.get());
+    }
+  }
+
+  public boolean hasSubscription(String name) {
+    return subscriptions.containsKey(name);
+  }
+
+  @Override
+  public void run() {
+    while (running) {
+      try {
+        PubSubReply reply = pubSubConnection.read();
+
+        switch (reply.getType()) {
+          case UNSUBSCRIBE:                             break;
+          case SUBSCRIBE:   dispatchSubscribe(reply);   break;
+          case MESSAGE:     dispatchMessage(reply);     break;
+          default:          throw new AssertionError("Unknown pubsub reply type! " + reply.getType());
+        }
+      } catch (IOException e) {
+        logger.warn("***** PubSub Connection Error *****", e);
+        if (running) {
+          this.pubSubConnection.close();
+          this.pubSubConnection = redisPubSubConnectionFactory.connect();
+          resubscribeAll();
+        }
+      }
+    }
+
+    logger.warn("DispatchManager Shutting Down...");
+  }
+
+  private void dispatchSubscribe(final PubSubReply reply) {
+    Optional<DispatchChannel> subscription = Optional.fromNullable(subscriptions.get(reply.getChannel()));
+
+    if (subscription.isPresent()) {
+      dispatchSubscription(reply.getChannel(), subscription.get());
+    } else {
+      logger.warn("Received subscribe event for non-existing channel: " + reply.getChannel());
+    }
+  }
+
+  private void dispatchMessage(PubSubReply reply) {
+    Optional<DispatchChannel> subscription = Optional.fromNullable(subscriptions.get(reply.getChannel()));
+
+    if (subscription.isPresent()) {
+      dispatchMessage(reply.getChannel(), subscription.get(), reply.getContent().get());
+    } else if (deadLetterChannel.isPresent()) {
+      dispatchMessage(reply.getChannel(), deadLetterChannel.get(), reply.getContent().get());
+    } else {
+      logger.warn("Received message for non-existing channel, with no dead letter handler: " + reply.getChannel());
+    }
+  }
+
+  private void resubscribeAll() {
+    new Thread() {
+      @Override
+      public void run() {
+        synchronized (DispatchManager.this) {
+          try {
+            for (String name : subscriptions.keySet()) {
+              pubSubConnection.subscribe(name);
+            }
+          } catch (IOException e) {
+            logger.warn("***** RESUBSCRIPTION ERROR *****", e);
+          }
+        }
+      }
+    }.start();
+  }
+
+  private void dispatchMessage(final String name, final DispatchChannel channel, final byte[] message) {
+    executor.execute(new Runnable() {
+      @Override
+      public void run() {
+        channel.onDispatchMessage(name, message);
+      }
+    });
+  }
+
+  private void dispatchSubscription(final String name, final DispatchChannel channel) {
+    executor.execute(new Runnable() {
+      @Override
+      public void run() {
+        channel.onDispatchSubscribed(name);
+      }
+    });
+  }
+
+  private void dispatchUnsubscription(final String name, final DispatchChannel channel) {
+    executor.execute(new Runnable() {
+      @Override
+      public void run() {
+        channel.onDispatchUnsubscribed(name);
+      }
+    });
+  }
+}

src/main/java/org/whispersystems/dispatch/io/RedisInputStream.java

@@ -0,0 +1,64 @@
+package org.whispersystems.dispatch.io;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class RedisInputStream {
+
+  private static final byte CR = 0x0D;
+  private static final byte LF = 0x0A;
+
+  private final InputStream inputStream;
+
+  public RedisInputStream(InputStream inputStream) {
+    this.inputStream = inputStream;
+  }
+
+  public String readLine() throws IOException {
+    ByteArrayOutputStream boas = new ByteArrayOutputStream();
+
+    boolean foundCr = false;
+
+    while (true) {
+      int character = inputStream.read();
+
+      if (character == -1) {
+        throw new IOException("Stream closed!");
+      }
+
+      boas.write(character);
+
+      if      (foundCr && character == LF) break;
+      else if (character == CR)            foundCr = true;
+      else if (foundCr)                    foundCr = false;
+    }
+
+    byte[] data = boas.toByteArray();
+    return new String(data, 0, data.length-2);
+  }
+
+  public byte[] readFully(int size) throws IOException {
+    byte[] result    = new byte[size];
+    int    offset    = 0;
+    int    remaining = result.length;
+
+    while (remaining > 0) {
+      int read = inputStream.read(result, offset, remaining);
+
+      if (read < 0) {
+        throw new IOException("Stream closed!");
+      }
+
+      offset    += read;
+      remaining -= read;
+    }
+
+    return result;
+  }
+
+  public void close() throws IOException {
+    inputStream.close();
+  }
+
+}

src/main/java/org/whispersystems/dispatch/io/RedisPubSubConnectionFactory.java

@@ -0,0 +1,9 @@
+package org.whispersystems.dispatch.io;
+
+import org.whispersystems.dispatch.redis.PubSubConnection;
+
+public interface RedisPubSubConnectionFactory {
+
+  public PubSubConnection connect();
+
+}

src/main/java/org/whispersystems/dispatch/redis/PubSubConnection.java

@@ -0,0 +1,119 @@
+package org.whispersystems.dispatch.redis;
+
+import com.google.common.base.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.dispatch.io.RedisInputStream;
+import org.whispersystems.dispatch.redis.protocol.ArrayReplyHeader;
+import org.whispersystems.dispatch.redis.protocol.IntReply;
+import org.whispersystems.dispatch.redis.protocol.StringReplyHeader;
+import org.whispersystems.dispatch.util.Util;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class PubSubConnection {
+
+  private final Logger logger = LoggerFactory.getLogger(PubSubConnection.class);
+
+  private static final byte[] UNSUBSCRIBE_TYPE    = {'u', 'n', 's', 'u', 'b', 's', 'c', 'r', 'i', 'b', 'e'     };
+  private static final byte[] SUBSCRIBE_TYPE      = {'s', 'u', 'b', 's', 'c', 'r', 'i', 'b', 'e'               };
+  private static final byte[] MESSAGE_TYPE        = {'m', 'e', 's', 's', 'a', 'g', 'e'                         };
+
+  private static final byte[] SUBSCRIBE_COMMAND   = {'S', 'U', 'B', 'S', 'C', 'R', 'I', 'B', 'E', ' '          };
+  private static final byte[] UNSUBSCRIBE_COMMAND = {'U', 'N', 'S', 'U', 'B', 'S', 'C', 'R', 'I', 'B', 'E', ' '};
+  private static final byte[] CRLF                = {'\r', '\n'                                                };
+
+  private final OutputStream     outputStream;
+  private final RedisInputStream inputStream;
+  private final Socket           socket;
+  private final AtomicBoolean    closed;
+
+  public PubSubConnection(Socket socket) throws IOException {
+    this.socket       = socket;
+    this.outputStream = socket.getOutputStream();
+    this.inputStream  = new RedisInputStream(new BufferedInputStream(socket.getInputStream()));
+    this.closed       = new AtomicBoolean(false);
+  }
+
+  public void subscribe(String channelName) throws IOException {
+    if (closed.get()) throw new IOException("Connection closed!");
+
+    byte[] command = Util.combine(SUBSCRIBE_COMMAND, channelName.getBytes(), CRLF);
+    outputStream.write(command);
+  }
+
+  public void unsubscribe(String channelName) throws IOException {
+    if (closed.get()) throw new IOException("Connection closed!");
+
+    byte[] command = Util.combine(UNSUBSCRIBE_COMMAND, channelName.getBytes(), CRLF);
+    outputStream.write(command);
+  }
+
+  public PubSubReply read() throws IOException {
+    if (closed.get()) throw new IOException("Connection closed!");
+
+    ArrayReplyHeader replyHeader = new ArrayReplyHeader(inputStream.readLine());
+
+    if (replyHeader.getElementCount() != 3) {
+      throw new IOException("Received array reply header with strange count: " + replyHeader.getElementCount());
+    }
+
+    StringReplyHeader replyTypeHeader = new StringReplyHeader(inputStream.readLine());
+    byte[]            replyType       = inputStream.readFully(replyTypeHeader.getStringLength());
+    inputStream.readLine();
+
+    if      (Arrays.equals(SUBSCRIBE_TYPE, replyType))   return readSubscribeReply();
+    else if (Arrays.equals(UNSUBSCRIBE_TYPE, replyType)) return readUnsubscribeReply();
+    else if (Arrays.equals(MESSAGE_TYPE, replyType))     return readMessageReply();
+    else throw new IOException("Unknown reply type: " + new String(replyType));
+  }
+
+  public void close() {
+    try {
+      this.closed.set(true);
+      this.inputStream.close();
+      this.outputStream.close();
+      this.socket.close();
+    } catch (IOException e) {
+      logger.warn("Exception while closing", e);
+    }
+  }
+
+  private PubSubReply readMessageReply() throws IOException {
+    StringReplyHeader channelNameHeader = new StringReplyHeader(inputStream.readLine());
+    byte[]            channelName       = inputStream.readFully(channelNameHeader.getStringLength());
+    inputStream.readLine();
+
+    StringReplyHeader messageHeader = new StringReplyHeader(inputStream.readLine());
+    byte[]            message       = inputStream.readFully(messageHeader.getStringLength());
+    inputStream.readLine();
+
+    return new PubSubReply(PubSubReply.Type.MESSAGE, new String(channelName), Optional.of(message));
+  }
+
+  private PubSubReply readUnsubscribeReply() throws IOException {
+    String channelName = readSubscriptionReply();
+    return new PubSubReply(PubSubReply.Type.UNSUBSCRIBE, channelName, Optional.<byte[]>absent());
+  }
+
+  private PubSubReply readSubscribeReply() throws IOException {
+    String channelName = readSubscriptionReply();
+    return new PubSubReply(PubSubReply.Type.SUBSCRIBE, channelName, Optional.<byte[]>absent());
+  }
+
+  private String readSubscriptionReply() throws IOException {
+    StringReplyHeader channelNameHeader = new StringReplyHeader(inputStream.readLine());
+    byte[]            channelName       = inputStream.readFully(channelNameHeader.getStringLength());
+    inputStream.readLine();
+
+    IntReply subscriptionCount = new IntReply(inputStream.readLine());
+
+    return new String(channelName);
+  }
+
+}

src/main/java/org/whispersystems/dispatch/redis/PubSubReply.java

@@ -0,0 +1,35 @@
+package org.whispersystems.dispatch.redis;
+
+import com.google.common.base.Optional;
+
+public class PubSubReply {
+
+  public enum Type {
+    MESSAGE,
+    SUBSCRIBE,
+    UNSUBSCRIBE
+  }
+
+  private final Type             type;
+  private final String          channel;
+  private final Optional<byte[]> content;
+
+  public PubSubReply(Type type, String channel, Optional<byte[]> content) {
+    this.type    = type;
+    this.channel = channel;
+    this.content = content;
+  }
+
+  public Type getType() {
+    return type;
+  }
+
+  public String getChannel() {
+    return channel;
+  }
+
+  public Optional<byte[]> getContent() {
+    return content;
+  }
+
+}

src/main/java/org/whispersystems/dispatch/redis/protocol/ArrayReplyHeader.java

@@ -0,0 +1,24 @@
+package org.whispersystems.dispatch.redis.protocol;
+
+import java.io.IOException;
+
+public class ArrayReplyHeader {
+
+  private final int elementCount;
+
+  public ArrayReplyHeader(String header) throws IOException {
+    if (header == null || header.length() < 2 || header.charAt(0) != '*') {
+      throw new IOException("Invalid array reply header: " + header);
+    }
+
+    try {
+      this.elementCount = Integer.parseInt(header.substring(1));
+    } catch (NumberFormatException e) {
+      throw new IOException(e);
+    }
+  }
+
+  public int getElementCount() {
+    return elementCount;
+  }
+}

src/main/java/org/whispersystems/dispatch/redis/protocol/IntReply.java

@@ -0,0 +1,24 @@
+package org.whispersystems.dispatch.redis.protocol;
+
+import java.io.IOException;
+
+public class IntReply {
+
+  private final int value;
+
+  public IntReply(String reply) throws IOException {
+    if (reply == null || reply.length() < 2 || reply.charAt(0) != ':') {
+      throw new IOException("Invalid int reply: " + reply);
+    }
+
+    try {
+      this.value = Integer.parseInt(reply.substring(1));
+    } catch (NumberFormatException e) {
+      throw new IOException(e);
+    }
+  }
+
+  public int getValue() {
+    return value;
+  }
+}

src/main/java/org/whispersystems/dispatch/redis/protocol/StringReplyHeader.java

@@ -0,0 +1,24 @@
+package org.whispersystems.dispatch.redis.protocol;
+
+import java.io.IOException;
+
+public class StringReplyHeader {
+
+  private final int stringLength;
+
+  public StringReplyHeader(String header) throws IOException {
+    if (header == null || header.length() < 2 || header.charAt(0) != '$') {
+      throw new IOException("Invalid string reply header: " + header);
+    }
+
+    try {
+      this.stringLength = Integer.parseInt(header.substring(1));
+    } catch (NumberFormatException e) {
+      throw new IOException(e);
+    }
+  }
+
+  public int getStringLength() {
+    return stringLength;
+  }
+}

src/main/java/org/whispersystems/dispatch/util/Util.java

@@ -0,0 +1,36 @@
+package org.whispersystems.dispatch.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class Util {
+
+  public static byte[] combine(byte[]... elements) {
+    try {
+      int sum = 0;
+
+      for (byte[] element : elements) {
+        sum += element.length;
+      }
+
+      ByteArrayOutputStream baos = new ByteArrayOutputStream(sum);
+
+      for (byte[] element : elements) {
+        baos.write(element);
+      }
+
+      return baos.toByteArray();
+    } catch (IOException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+
+  public static void sleep(long millis) {
+    try {
+      Thread.sleep(millis);
+    } catch (InterruptedException e) {
+      throw new AssertionError(e);
+    }
+  }
+}

src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java

@@ -25,12 +25,18 @@ import org.whispersystems.textsecuregcm.configuration.RateLimitsConfiguration;
 import org.whispersystems.textsecuregcm.configuration.RedPhoneConfiguration;
 import org.whispersystems.textsecuregcm.configuration.RedisConfiguration;
 import org.whispersystems.textsecuregcm.configuration.S3Configuration;
+import org.whispersystems.textsecuregcm.configuration.TestDeviceConfiguration;
 import org.whispersystems.textsecuregcm.configuration.TwilioConfiguration;
 import org.whispersystems.textsecuregcm.configuration.WebsocketConfiguration;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
 import io.dropwizard.Configuration;
 import io.dropwizard.client.JerseyClientConfiguration;
 import io.dropwizard.db.DataSourceFactory;
@@ -70,6 +76,10 @@ public class WhisperServerConfiguration extends Configuration {
   @JsonProperty
   private DataSourceFactory messageStore;
 
+  @Valid
+  @NotNull
+  @JsonProperty
+  private List<TestDeviceConfiguration> testDevices = new LinkedList<>();
 
   @Valid
   @JsonProperty
@@ -157,4 +167,15 @@ public class WhisperServerConfiguration extends Configuration {
   public RedPhoneConfiguration getRedphoneConfiguration() {
     return redphone;
   }
+
+  public Map<String, Integer> getTestDevices() {
+    Map<String, Integer> results = new HashMap<>();
+
+    for (TestDeviceConfiguration testDeviceConfiguration : testDevices) {
+      results.put(testDeviceConfiguration.getNumber(),
+                  testDeviceConfiguration.getCode());
+    }
+
+    return results;
+  }
 }

src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java

@@ -24,6 +24,8 @@ import com.sun.jersey.api.client.Client;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.eclipse.jetty.servlets.CrossOriginFilter;
 import org.skife.jdbi.v2.DBI;
+import org.whispersystems.dispatch.DispatchChannel;
+import org.whispersystems.dispatch.DispatchManager;
 import org.whispersystems.textsecuregcm.auth.AccountAuthenticator;
 import org.whispersystems.textsecuregcm.auth.FederatedPeerAuthenticator;
 import org.whispersystems.textsecuregcm.auth.MultiBasicAuthProvider;
@@ -44,7 +46,9 @@ import org.whispersystems.textsecuregcm.federation.FederatedClientManager;
 import org.whispersystems.textsecuregcm.federation.FederatedPeer;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.liquibase.NameableMigrationsBundle;
+import org.whispersystems.textsecuregcm.mappers.DeviceLimitExceededExceptionMapper;
 import org.whispersystems.textsecuregcm.mappers.IOExceptionMapper;
+import org.whispersystems.textsecuregcm.mappers.InvalidWebsocketAddressExceptionMapper;
 import org.whispersystems.textsecuregcm.mappers.RateLimitExceededExceptionMapper;
 import org.whispersystems.textsecuregcm.metrics.CpuUsageGauge;
 import org.whispersystems.textsecuregcm.metrics.FreeMemoryGauge;
@@ -53,9 +57,11 @@ import org.whispersystems.textsecuregcm.metrics.NetworkSentGauge;
 import org.whispersystems.textsecuregcm.providers.RedisClientFactory;
 import org.whispersystems.textsecuregcm.providers.RedisHealthCheck;
 import org.whispersystems.textsecuregcm.providers.TimeProvider;
+import org.whispersystems.textsecuregcm.push.ApnFallbackManager;
 import org.whispersystems.textsecuregcm.push.FeedbackHandler;
 import org.whispersystems.textsecuregcm.push.PushSender;
 import org.whispersystems.textsecuregcm.push.PushServiceClient;
+import org.whispersystems.textsecuregcm.push.ReceiptSender;
 import org.whispersystems.textsecuregcm.push.WebsocketSender;
 import org.whispersystems.textsecuregcm.sms.NexmoSmsSender;
 import org.whispersystems.textsecuregcm.sms.SmsSender;
@@ -147,10 +153,11 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     Keys            keys            = database.onDemand(Keys.class);
     Messages        messages        = messagedb.onDemand(Messages.class);
 
-    JedisPool       cacheClient        = new RedisClientFactory(config.getCacheConfiguration().getUrl()).getRedisClientPool();
-    JedisPool       directoryClient    = new RedisClientFactory(config.getDirectoryConfiguration().getUrl()).getRedisClientPool();
-    Client          httpClient         = new JerseyClientBuilder(environment).using(config.getJerseyClientConfiguration())
-                                                                             .build(getName());
+    RedisClientFactory cacheClientFactory = new RedisClientFactory(config.getCacheConfiguration().getUrl());
+    JedisPool          cacheClient        = cacheClientFactory.getRedisClientPool();
+    JedisPool          directoryClient    = new RedisClientFactory(config.getDirectoryConfiguration().getUrl()).getRedisClientPool();
+    Client             httpClient         = new JerseyClientBuilder(environment).using(config.getJerseyClientConfiguration())
+                                                                                .build(getName());
 
     DirectoryManager       directory              = new DirectoryManager(directoryClient);
     PendingAccountsManager pendingAccountsManager = new PendingAccountsManager(pendingAccounts, cacheClient);
@@ -159,38 +166,43 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     FederatedClientManager federatedClientManager = new FederatedClientManager(config.getFederationConfiguration());
     MessagesManager        messagesManager        = new MessagesManager(messages);
     DeadLetterHandler      deadLetterHandler      = new DeadLetterHandler(messagesManager);
-    PubSubManager          pubSubManager          = new PubSubManager(cacheClient, deadLetterHandler);
+    DispatchManager        dispatchManager        = new DispatchManager(cacheClientFactory, Optional.<DispatchChannel>of(deadLetterHandler));
+    PubSubManager          pubSubManager          = new PubSubManager(cacheClient, dispatchManager);
     PushServiceClient      pushServiceClient      = new PushServiceClient(httpClient, config.getPushConfiguration());
     WebsocketSender        websocketSender        = new WebsocketSender(messagesManager, pubSubManager);
     AccountAuthenticator   deviceAuthenticator    = new AccountAuthenticator(accountsManager);
     RateLimiters           rateLimiters           = new RateLimiters(config.getLimitsConfiguration(), cacheClient);
 
+    ApnFallbackManager       apnFallbackManager  = new ApnFallbackManager(pushServiceClient);
     TwilioSmsSender          twilioSmsSender     = new TwilioSmsSender(config.getTwilioConfiguration());
     Optional<NexmoSmsSender> nexmoSmsSender      = initializeNexmoSmsSender(config.getNexmoConfiguration());
     SmsSender                smsSender           = new SmsSender(twilioSmsSender, nexmoSmsSender, config.getTwilioConfiguration().isInternational());
     UrlSigner                urlSigner           = new UrlSigner(config.getS3Configuration());
-    PushSender               pushSender          = new PushSender(pushServiceClient, websocketSender);
+    PushSender               pushSender          = new PushSender(apnFallbackManager, pushServiceClient, websocketSender);
+    ReceiptSender            receiptSender       = new ReceiptSender(accountsManager, pushSender, federatedClientManager);
     FeedbackHandler          feedbackHandler     = new FeedbackHandler(pushServiceClient, accountsManager);
     Optional<byte[]>         authorizationKey    = config.getRedphoneConfiguration().getAuthorizationKey();
 
+    environment.lifecycle().manage(apnFallbackManager);
+    environment.lifecycle().manage(pubSubManager);
     environment.lifecycle().manage(feedbackHandler);
 
     AttachmentController attachmentController = new AttachmentController(rateLimiters, federatedClientManager, urlSigner);
     KeysControllerV1     keysControllerV1     = new KeysControllerV1(rateLimiters, keys, accountsManager, federatedClientManager);
     KeysControllerV2     keysControllerV2     = new KeysControllerV2(rateLimiters, keys, accountsManager, federatedClientManager);
-    MessageController    messageController    = new MessageController(rateLimiters, pushSender, accountsManager, federatedClientManager);
+    MessageController    messageController    = new MessageController(rateLimiters, pushSender, receiptSender, accountsManager, messagesManager, federatedClientManager);
 
     environment.jersey().register(new MultiBasicAuthProvider<>(new FederatedPeerAuthenticator(config.getFederationConfiguration()),
                                                                FederatedPeer.class,
                                                                deviceAuthenticator,
                                                                Device.class, "WhisperServer"));
 
-    environment.jersey().register(new AccountController(pendingAccountsManager, accountsManager, rateLimiters, smsSender, messagesManager, new TimeProvider(), authorizationKey));
+    environment.jersey().register(new AccountController(pendingAccountsManager, accountsManager, rateLimiters, smsSender, messagesManager, new TimeProvider(), authorizationKey, config.getTestDevices()));
     environment.jersey().register(new DeviceController(pendingDevicesManager, accountsManager, rateLimiters));
     environment.jersey().register(new DirectoryController(rateLimiters, directory));
     environment.jersey().register(new FederationControllerV1(accountsManager, attachmentController, messageController, keysControllerV1));
     environment.jersey().register(new FederationControllerV2(accountsManager, attachmentController, messageController, keysControllerV2));
-    environment.jersey().register(new ReceiptController(accountsManager, federatedClientManager, pushSender));
+    environment.jersey().register(new ReceiptController(receiptSender));
     environment.jersey().register(new ProvisioningController(rateLimiters, pushSender));
     environment.jersey().register(attachmentController);
     environment.jersey().register(keysControllerV1);
@@ -200,12 +212,12 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     if (config.getWebsocketConfiguration().isEnabled()) {
       WebSocketEnvironment webSocketEnvironment = new WebSocketEnvironment(environment, config, 90000);
       webSocketEnvironment.setAuthenticator(new WebSocketAccountAuthenticator(deviceAuthenticator));
-      webSocketEnvironment.setConnectListener(new AuthenticatedConnectListener(accountsManager, pushSender, messagesManager, pubSubManager));
-      webSocketEnvironment.jersey().register(new KeepAliveController());
+      webSocketEnvironment.setConnectListener(new AuthenticatedConnectListener(accountsManager, pushSender, receiptSender, messagesManager, pubSubManager, apnFallbackManager));
+      webSocketEnvironment.jersey().register(new KeepAliveController(pubSubManager));
 
       WebSocketEnvironment provisioningEnvironment = new WebSocketEnvironment(environment, config);
       provisioningEnvironment.setConnectListener(new ProvisioningConnectListener(pubSubManager));
-      provisioningEnvironment.jersey().register(new KeepAliveController());
+      provisioningEnvironment.jersey().register(new KeepAliveController(pubSubManager));
       
       WebSocketResourceProviderFactory webSocketServlet    = new WebSocketResourceProviderFactory(webSocketEnvironment   );
       WebSocketResourceProviderFactory provisioningServlet = new WebSocketResourceProviderFactory(provisioningEnvironment);
@@ -236,6 +248,8 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
 
     environment.jersey().register(new IOExceptionMapper());
     environment.jersey().register(new RateLimitExceededExceptionMapper());
+    environment.jersey().register(new InvalidWebsocketAddressExceptionMapper());
+    environment.jersey().register(new DeviceLimitExceededExceptionMapper());
 
     environment.metrics().register(name(CpuUsageGauge.class, "cpu"), new CpuUsageGauge());
     environment.metrics().register(name(FreeMemoryGauge.class, "free_memory"), new FreeMemoryGauge());
@@ -263,5 +277,4 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
   public static void main(String[] args) throws Exception {
     new WhisperServerService().run(args);
   }
-
 }

src/main/java/org/whispersystems/textsecuregcm/configuration/TestDeviceConfiguration.java

@@ -0,0 +1,25 @@
+package org.whispersystems.textsecuregcm.configuration;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
+
+public class TestDeviceConfiguration {
+
+  @JsonProperty
+  @NotEmpty
+  private String number;
+
+  @JsonProperty
+  @NotNull
+  private int code;
+
+  public String getNumber() {
+    return number;
+  }
+
+  public int getCode() {
+    return code;
+  }
+}

src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java

@@ -56,6 +56,7 @@ import javax.ws.rs.core.Response;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.util.Map;
 
 import io.dropwizard.auth.Auth;
 
@@ -71,6 +72,7 @@ public class AccountController {
   private final MessagesManager        messagesManager;
   private final TimeProvider           timeProvider;
   private final Optional<byte[]>       authorizationKey;
+  private final Map<String, Integer>   testDevices;
 
   public AccountController(PendingAccountsManager pendingAccounts,
                            AccountsManager accounts,
@@ -78,7 +80,8 @@ public class AccountController {
                            SmsSender smsSenderFactory,
                            MessagesManager messagesManager,
                            TimeProvider timeProvider,
-                           Optional<byte[]> authorizationKey)
+                           Optional<byte[]> authorizationKey,
+                           Map<String, Integer> testDevices)
   {
     this.pendingAccounts  = pendingAccounts;
     this.accounts         = accounts;
@@ -87,6 +90,7 @@ public class AccountController {
     this.messagesManager  = messagesManager;
     this.timeProvider     = timeProvider;
     this.authorizationKey = authorizationKey;
+    this.testDevices      = testDevices;
   }
 
   @Timed
@@ -112,10 +116,12 @@ public class AccountController {
         throw new WebApplicationException(Response.status(422).build());
     }
 
-    VerificationCode verificationCode = generateVerificationCode();
+    VerificationCode verificationCode = generateVerificationCode(number);
     pendingAccounts.store(number, verificationCode.getVerificationCode());
 
-    if (transport.equals("sms")) {
+    if (testDevices.containsKey(number)) {
+      // noop
+    } else if (transport.equals("sms")) {
       smsSender.deliverSmsVerification(number, verificationCode.getVerificationCodeDisplay());
     } else if (transport.equals("voice")) {
       smsSender.deliverVoxVerification(number, verificationCode.getVerificationCodeSpeech());
@@ -200,6 +206,7 @@ public class AccountController {
   public void setGcmRegistrationId(@Auth Account account, @Valid GcmRegistrationId registrationId) {
     Device device = account.getAuthenticatedDevice().get();
     device.setApnId(null);
+    device.setVoipApnId(null);
     device.setGcmId(registrationId.getGcmRegistrationId());
 
     if (registrationId.isWebSocketChannel()) device.setFetchesMessages(true);
@@ -225,6 +232,7 @@ public class AccountController {
   public void setApnRegistrationId(@Auth Account account, @Valid ApnRegistrationId registrationId) {
     Device device = account.getAuthenticatedDevice().get();
     device.setApnId(registrationId.getApnRegistrationId());
+    device.setVoipApnId(registrationId.getVoipRegistrationId());
     device.setGcmId(null);
     device.setFetchesMessages(true);
     accounts.update(account);
@@ -274,10 +282,12 @@ public class AccountController {
     device.setSignalingKey(accountAttributes.getSignalingKey());
     device.setFetchesMessages(accountAttributes.getFetchesMessages());
     device.setRegistrationId(accountAttributes.getRegistrationId());
+    device.setName(accountAttributes.getName());
+    device.setCreated(System.currentTimeMillis());
+    device.setLastSeen(Util.todayInMillis());
 
     Account account = new Account();
     account.setNumber(number);
-    account.setSupportsSms(accountAttributes.getSupportsSms());
     account.addDevice(device);
 
     accounts.create(account);
@@ -287,8 +297,12 @@ public class AccountController {
     logger.debug("Stored device...");
   }
 
-  @VisibleForTesting protected VerificationCode generateVerificationCode() {
+  @VisibleForTesting protected VerificationCode generateVerificationCode(String number) {
     try {
+      if (testDevices.containsKey(number)) {
+        return new VerificationCode(testDevices.get(number));
+      }
+
       SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
       int randomInt       = 100000 + random.nextInt(900000);
       return new VerificationCode(randomInt);

src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java

@@ -25,6 +25,8 @@ import org.whispersystems.textsecuregcm.auth.AuthenticationCredentials;
 import org.whispersystems.textsecuregcm.auth.AuthorizationHeader;
 import org.whispersystems.textsecuregcm.auth.InvalidAuthorizationHeaderException;
 import org.whispersystems.textsecuregcm.entities.AccountAttributes;
+import org.whispersystems.textsecuregcm.entities.DeviceInfo;
+import org.whispersystems.textsecuregcm.entities.DeviceInfoList;
 import org.whispersystems.textsecuregcm.entities.DeviceResponse;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.storage.Account;
@@ -36,6 +38,7 @@ import org.whispersystems.textsecuregcm.util.VerificationCode;
 
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.HeaderParam;
 import javax.ws.rs.PUT;
@@ -48,6 +51,8 @@ import javax.ws.rs.core.Response;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.util.LinkedList;
+import java.util.List;
 
 import io.dropwizard.auth.Auth;
 
@@ -56,6 +61,8 @@ public class DeviceController {
 
   private final Logger logger = LoggerFactory.getLogger(DeviceController.class);
 
+  private static final int MAX_DEVICES = 3;
+
   private final PendingDevicesManager pendingDevices;
   private final AccountsManager       accounts;
   private final RateLimiters          rateLimiters;
@@ -69,15 +76,49 @@ public class DeviceController {
     this.rateLimiters    = rateLimiters;
   }
 
+  @Timed
+  @GET
+  @Produces(MediaType.APPLICATION_JSON)
+  public DeviceInfoList getDevices(@Auth Account account) {
+    List<DeviceInfo> devices = new LinkedList<>();
+
+    for (Device device : account.getDevices()) {
+      devices.add(new DeviceInfo(device.getId(), device.getName(),
+                                 device.getLastSeen(), device.getCreated()));
+    }
+
+    return new DeviceInfoList(devices);
+  }
+
+  @Timed
+  @DELETE
+  @Path("/{device_id}")
+  public void removeDevice(@Auth Account account, @PathParam("device_id") long deviceId) {
+    if (account.getAuthenticatedDevice().get().getId() != Device.MASTER_ID) {
+      throw new WebApplicationException(Response.Status.UNAUTHORIZED);
+    }
+
+    account.removeDevice(deviceId);
+    accounts.update(account);
+  }
+
   @Timed
   @GET
   @Path("/provisioning/code")
   @Produces(MediaType.APPLICATION_JSON)
   public VerificationCode createDeviceToken(@Auth Account account)
-      throws RateLimitExceededException
+      throws RateLimitExceededException, DeviceLimitExceededException
   {
     rateLimiters.getAllocateDeviceLimiter().validate(account.getNumber());
 
+    if (account.getActiveDeviceCount() >= MAX_DEVICES) {
+      throw new DeviceLimitExceededException(account.getDevices().size(), MAX_DEVICES);
+    }
+
+    if (account.getAuthenticatedDevice().get().getId() != Device.MASTER_ID) {
+      throw new WebApplicationException(Response.Status.UNAUTHORIZED);
+    }
+
     VerificationCode verificationCode = generateVerificationCode();
     pendingDevices.store(account.getNumber(), verificationCode.getVerificationCode());
 
@@ -92,7 +133,7 @@ public class DeviceController {
   public DeviceResponse verifyDeviceToken(@PathParam("verification_code") String verificationCode,
                                           @HeaderParam("Authorization")   String authorizationHeader,
                                           @Valid                          AccountAttributes accountAttributes)
-      throws RateLimitExceededException
+      throws RateLimitExceededException, DeviceLimitExceededException
   {
     try {
       AuthorizationHeader header = AuthorizationHeader.fromFullHeader(authorizationHeader);
@@ -115,13 +156,19 @@ public class DeviceController {
         throw new WebApplicationException(Response.status(403).build());
       }
 
+      if (account.get().getActiveDeviceCount() >= MAX_DEVICES) {
+        throw new DeviceLimitExceededException(account.get().getDevices().size(), MAX_DEVICES);
+      }
+
       Device device = new Device();
+      device.setName(accountAttributes.getName());
       device.setAuthenticationCredentials(new AuthenticationCredentials(password));
       device.setSignalingKey(accountAttributes.getSignalingKey());
       device.setFetchesMessages(accountAttributes.getFetchesMessages());
       device.setId(account.get().getNextDeviceId());
       device.setRegistrationId(accountAttributes.getRegistrationId());
       device.setLastSeen(Util.todayInMillis());
+      device.setCreated(System.currentTimeMillis());
 
       account.get().addDevice(device);
       accounts.update(account.get());

src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceLimitExceededException.java

@@ -0,0 +1,21 @@
+package org.whispersystems.textsecuregcm.controllers;
+
+
+public class DeviceLimitExceededException extends Exception {
+
+  private final int currentDevices;
+  private final int maxDevices;
+
+  public DeviceLimitExceededException(int currentDevices, int maxDevices) {
+    this.currentDevices = currentDevices;
+    this.maxDevices     = maxDevices;
+  }
+
+  public int getCurrentDevices() {
+    return currentDevices;
+  }
+
+  public int getMaxDevices() {
+    return maxDevices;
+  }
+}

src/main/java/org/whispersystems/textsecuregcm/controllers/FederationControllerV1.java

@@ -150,7 +150,7 @@ public class FederationControllerV1 extends FederationController {
 
     for (Account account : accountList) {
       byte[]        token         = Util.getContactToken(account.getNumber());
-      ClientContact clientContact = new ClientContact(token, null, account.getSupportsSms());
+      ClientContact clientContact = new ClientContact(token, null);
 
       if (!account.isActive()) {
         clientContact.setInactive(true);

src/main/java/org/whispersystems/textsecuregcm/controllers/KeepAliveController.java

@@ -1,19 +1,47 @@
 package org.whispersystems.textsecuregcm.controllers;
 
 import com.codahale.metrics.annotation.Timed;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.textsecuregcm.storage.Account;
+import org.whispersystems.textsecuregcm.storage.PubSubManager;
+import org.whispersystems.textsecuregcm.websocket.WebsocketAddress;
+import org.whispersystems.websocket.session.WebSocketSession;
+import org.whispersystems.websocket.session.WebSocketSessionContext;
 
 import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.core.Response;
 
+import io.dropwizard.auth.Auth;
+
 
 @Path("/v1/keepalive")
 public class KeepAliveController {
 
+  private final Logger logger = LoggerFactory.getLogger(KeepAliveController.class);
+
+  private final PubSubManager pubSubManager;
+
+  public KeepAliveController(PubSubManager pubSubManager) {
+    this.pubSubManager = pubSubManager;
+  }
+
   @Timed
   @GET
-  public Response getKeepAlive() {
+  public Response getKeepAlive(@Auth(required = false) Account account,
+                               @WebSocketSession       WebSocketSessionContext context)
+  {
+    if (account != null) {
+      WebsocketAddress address = new WebsocketAddress(account.getNumber(),
+                                                      account.getAuthenticatedDevice().get().getId());
+
+      if (!pubSubManager.hasLocalSubscription(address)) {
+        logger.warn("***** No local subscription found for: " + address);
+        context.getClient().close(1000, "OK");
+      }
+    }
+
     return Response.ok().build();
   }
 

src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java

@@ -23,9 +23,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.entities.IncomingMessage;
 import org.whispersystems.textsecuregcm.entities.IncomingMessageList;
-import org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal;
+import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
 import org.whispersystems.textsecuregcm.entities.MessageResponse;
 import org.whispersystems.textsecuregcm.entities.MismatchedDevices;
+import org.whispersystems.textsecuregcm.entities.OutgoingMessageEntity;
+import org.whispersystems.textsecuregcm.entities.OutgoingMessageEntityList;
 import org.whispersystems.textsecuregcm.entities.SendMessageResponse;
 import org.whispersystems.textsecuregcm.entities.StaleDevices;
 import org.whispersystems.textsecuregcm.federation.FederatedClient;
@@ -34,15 +36,19 @@ import org.whispersystems.textsecuregcm.federation.NoSuchPeerException;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.push.NotPushRegisteredException;
 import org.whispersystems.textsecuregcm.push.PushSender;
+import org.whispersystems.textsecuregcm.push.ReceiptSender;
 import org.whispersystems.textsecuregcm.push.TransientPushFailureException;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.Device;
+import org.whispersystems.textsecuregcm.storage.MessagesManager;
 import org.whispersystems.textsecuregcm.util.Base64;
 import org.whispersystems.textsecuregcm.util.Util;
 
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
@@ -66,17 +72,23 @@ public class MessageController {
 
   private final RateLimiters           rateLimiters;
   private final PushSender             pushSender;
+  private final ReceiptSender          receiptSender;
   private final FederatedClientManager federatedClientManager;
   private final AccountsManager        accountsManager;
+  private final MessagesManager        messagesManager;
 
   public MessageController(RateLimiters rateLimiters,
                            PushSender pushSender,
+                           ReceiptSender receiptSender,
                            AccountsManager accountsManager,
+                           MessagesManager messagesManager,
                            FederatedClientManager federatedClientManager)
   {
     this.rateLimiters           = rateLimiters;
     this.pushSender             = pushSender;
+    this.receiptSender          = receiptSender;
     this.accountsManager        = accountsManager;
+    this.messagesManager        = messagesManager;
     this.federatedClientManager = federatedClientManager;
   }
 
@@ -90,7 +102,7 @@ public class MessageController {
                                          @Valid                    IncomingMessageList messages)
       throws IOException, RateLimitExceededException
   {
-    rateLimiters.getMessagesLimiter().validate(source.getNumber());
+    rateLimiters.getMessagesLimiter().validate(source.getNumber() + "__" + destinationName);
 
     try {
       boolean isSyncMessage = source.getNumber().equals(destinationName);
@@ -137,6 +149,38 @@ public class MessageController {
     }
   }
 
+  @Timed
+  @GET
+  @Produces(MediaType.APPLICATION_JSON)
+  public OutgoingMessageEntityList getPendingMessages(@Auth Account account) {
+    return new OutgoingMessageEntityList(messagesManager.getMessagesForDevice(account.getNumber(),
+                                                                              account.getAuthenticatedDevice()
+                                                                                     .get().getId()));
+  }
+
+  @Timed
+  @DELETE
+  @Path("/{source}/{timestamp}")
+  public void removePendingMessage(@Auth Account account,
+                                   @PathParam("source") String source,
+                                   @PathParam("timestamp") long timestamp)
+      throws IOException
+  {
+    try {
+      Optional<OutgoingMessageEntity> message = messagesManager.delete(account.getNumber(), source, timestamp);
+
+      if (message.isPresent() && message.get().getType() != Envelope.Type.RECEIPT_VALUE) {
+        receiptSender.sendReceipt(account,
+                                  message.get().getSource(),
+                                  message.get().getTimestamp(),
+                                  Optional.fromNullable(message.get().getRelay()));
+      }
+    } catch (NoSuchUserException | NotPushRegisteredException | TransientPushFailureException e) {
+      logger.warn("Sending delivery receipt", e);
+    }
+  }
+
+
   private void sendLocalMessage(Account source,
                                 String destinationName,
                                 IncomingMessageList messages,
@@ -168,16 +212,21 @@ public class MessageController {
       throws NoSuchUserException, IOException
   {
     try {
-      Optional<byte[]>              messageBody    = getMessageBody(incomingMessage);
-      OutgoingMessageSignal.Builder messageBuilder = OutgoingMessageSignal.newBuilder();
+      Optional<byte[]> messageBody    = getMessageBody(incomingMessage);
+      Optional<byte[]> messageContent = getMessageContent(incomingMessage);
+      Envelope.Builder messageBuilder = Envelope.newBuilder();
 
-      messageBuilder.setType(incomingMessage.getType())
+      messageBuilder.setType(Envelope.Type.valueOf(incomingMessage.getType()))
                     .setSource(source.getNumber())
                     .setTimestamp(timestamp == 0 ? System.currentTimeMillis() : timestamp)
-                    .setSourceDevice((int)source.getAuthenticatedDevice().get().getId());
+                    .setSourceDevice((int) source.getAuthenticatedDevice().get().getId());
 
       if (messageBody.isPresent()) {
-        messageBuilder.setMessage(ByteString.copyFrom(messageBody.get()));
+        messageBuilder.setLegacyMessage(ByteString.copyFrom(messageBody.get()));
+      }
+
+      if (messageContent.isPresent()) {
+        messageBuilder.setContent(ByteString.copyFrom(messageContent.get()));
       }
 
       if (source.getRelay().isPresent()) {
@@ -299,6 +348,8 @@ public class MessageController {
   }
 
   private Optional<byte[]> getMessageBody(IncomingMessage message) {
+    if (Util.isEmpty(message.getBody())) return Optional.absent();
+
     try {
       return Optional.of(Base64.decode(message.getBody()));
     } catch (IOException ioe) {
@@ -306,4 +357,15 @@ public class MessageController {
       return Optional.absent();
     }
   }
+
+  private Optional<byte[]> getMessageContent(IncomingMessage message) {
+    if (Util.isEmpty(message.getContent())) return Optional.absent();
+
+    try {
+      return Optional.of(Base64.decode(message.getContent()));
+    } catch (IOException ioe) {
+      logger.debug("Bad B64", ioe);
+      return Optional.absent();
+    }
+  }
 }

src/main/java/org/whispersystems/textsecuregcm/controllers/ProvisioningController.java

@@ -46,7 +46,7 @@ public class ProvisioningController {
   {
     rateLimiters.getMessagesLimiter().validate(source.getNumber());
 
-    if (!websocketSender.sendProvisioningMessage(new ProvisioningAddress(destinationName),
+    if (!websocketSender.sendProvisioningMessage(new ProvisioningAddress(destinationName, 0),
                                                  Base64.decode(message.getBody())))
     {
       throw new WebApplicationException(Response.Status.NOT_FOUND);

src/main/java/org/whispersystems/textsecuregcm/controllers/ReceiptController.java

@@ -2,14 +2,10 @@ package org.whispersystems.textsecuregcm.controllers;
 
 import com.codahale.metrics.annotation.Timed;
 import com.google.common.base.Optional;
-import org.whispersystems.textsecuregcm.federation.FederatedClientManager;
-import org.whispersystems.textsecuregcm.federation.NoSuchPeerException;
 import org.whispersystems.textsecuregcm.push.NotPushRegisteredException;
-import org.whispersystems.textsecuregcm.push.PushSender;
+import org.whispersystems.textsecuregcm.push.ReceiptSender;
 import org.whispersystems.textsecuregcm.push.TransientPushFailureException;
 import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.AccountsManager;
-import org.whispersystems.textsecuregcm.storage.Device;
 
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
@@ -18,25 +14,16 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
-import java.util.Set;
 
 import io.dropwizard.auth.Auth;
-import static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal;
 
 @Path("/v1/receipt")
 public class ReceiptController {
 
-  private final AccountsManager        accountManager;
-  private final PushSender             pushSender;
-  private final FederatedClientManager federatedClientManager;
+  private final ReceiptSender receiptSender;
 
-  public ReceiptController(AccountsManager accountManager,
-                           FederatedClientManager federatedClientManager,
-                           PushSender pushSender)
-  {
-    this.accountManager         = accountManager;
-    this.federatedClientManager = federatedClientManager;
-    this.pushSender             = pushSender;
+  public ReceiptController(ReceiptSender receiptSender) {
+    this.receiptSender = receiptSender;
   }
 
   @Timed
@@ -49,11 +36,7 @@ public class ReceiptController {
       throws IOException
   {
     try {
-      if (relay.isPresent() && !relay.get().isEmpty()) {
-        sendRelayedReceipt(source, destination, messageId, relay.get());
-      } else {
-        sendDirectReceipt(source, destination, messageId);
-      }
+      receiptSender.sendReceipt(source, destination, messageId, relay);
     } catch (NoSuchUserException | NotPushRegisteredException e) {
       throw new WebApplicationException(Response.Status.NOT_FOUND);
     } catch (TransientPushFailureException e) {
@@ -61,51 +44,4 @@ public class ReceiptController {
     }
   }
 
-  private void sendRelayedReceipt(Account source, String destination, long messageId, String relay)
-      throws NoSuchUserException, IOException
-  {
-    try {
-      federatedClientManager.getClient(relay)
-                            .sendDeliveryReceipt(source.getNumber(),
-                                                 source.getAuthenticatedDevice().get().getId(),
-                                                 destination, messageId);
-    } catch (NoSuchPeerException e) {
-      throw new NoSuchUserException(e);
-    }
-  }
-
-  private void sendDirectReceipt(Account source, String destination, long messageId)
-      throws NotPushRegisteredException, TransientPushFailureException, NoSuchUserException
-  {
-    Account     destinationAccount = getDestinationAccount(destination);
-    Set<Device> destinationDevices = destinationAccount.getDevices();
-
-    OutgoingMessageSignal.Builder message =
-        OutgoingMessageSignal.newBuilder()
-                             .setSource(source.getNumber())
-                             .setSourceDevice((int) source.getAuthenticatedDevice().get().getId())
-                             .setTimestamp(messageId)
-                             .setType(OutgoingMessageSignal.Type.RECEIPT_VALUE);
-
-    if (source.getRelay().isPresent()) {
-      message.setRelay(source.getRelay().get());
-    }
-
-    for (Device destinationDevice : destinationDevices) {
-      pushSender.sendMessage(destinationAccount, destinationDevice, message.build());
-    }
-  }
-
-  private Account getDestinationAccount(String destination)
-      throws NoSuchUserException
-  {
-    Optional<Account> account = accountManager.get(destination);
-
-    if (!account.isPresent()) {
-      throw new NoSuchUserException(destination);
-    }
-
-    return account.get();
-  }
-
 }

src/main/java/org/whispersystems/textsecuregcm/entities/AccountAttributes.java

@@ -17,40 +17,47 @@
 package org.whispersystems.textsecuregcm.entities;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.annotations.VisibleForTesting;
+import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.Max;
+
 public class AccountAttributes {
 
   @JsonProperty
   @NotEmpty
   private String signalingKey;
 
-  @JsonProperty
-  private boolean supportsSms;
-
   @JsonProperty
   private boolean fetchesMessages;
 
   @JsonProperty
   private int registrationId;
 
+  @JsonProperty
+  @Length(max = 50, message = "This field must be less than 50 characters")
+  private String name;
+
   public AccountAttributes() {}
 
-  public AccountAttributes(String signalingKey, boolean supportsSms, boolean fetchesMessages, int registrationId) {
+  @VisibleForTesting
+  public AccountAttributes(String signalingKey, boolean fetchesMessages, int registrationId) {
+    this(signalingKey, fetchesMessages, registrationId, null);
+  }
+
+  @VisibleForTesting
+  public AccountAttributes(String signalingKey, boolean fetchesMessages, int registrationId, String name) {
     this.signalingKey    = signalingKey;
-    this.supportsSms     = supportsSms;
     this.fetchesMessages = fetchesMessages;
     this.registrationId  = registrationId;
+    this.name            = name;
   }
 
   public String getSignalingKey() {
     return signalingKey;
   }
 
-  public boolean getSupportsSms() {
-    return supportsSms;
-  }
-
   public boolean getFetchesMessages() {
     return fetchesMessages;
   }
@@ -58,4 +65,8 @@ public class AccountAttributes {
   public int getRegistrationId() {
     return registrationId;
   }
+
+  public String getName() {
+    return name;
+  }
 }

src/main/java/org/whispersystems/textsecuregcm/entities/ApnMessage.java

@@ -5,8 +5,12 @@ import com.google.common.annotations.VisibleForTesting;
 import org.hibernate.validator.constraints.NotEmpty;
 
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
 
 public class ApnMessage {
+
+  public static long MAX_EXPIRATION = Integer.MAX_VALUE * 1000L;
+
   @JsonProperty
   @NotEmpty
   private String apnId;
@@ -23,12 +27,50 @@ public class ApnMessage {
   @NotEmpty
   private String message;
 
+  @JsonProperty
+  @NotNull
+  private boolean voip;
+
+  @JsonProperty
+  private long expirationTime;
+
   public ApnMessage() {}
 
-  public ApnMessage(String apnId, String number, int deviceId, String message) {
-    this.apnId    = apnId;
-    this.number   = number;
-    this.deviceId = deviceId;
-    this.message  = message;
+  public ApnMessage(String apnId, String number, int deviceId, String message, boolean voip, long expirationTime) {
+    this.apnId          = apnId;
+    this.number         = number;
+    this.deviceId       = deviceId;
+    this.message        = message;
+    this.voip           = voip;
+    this.expirationTime = expirationTime;
+  }
+
+  public ApnMessage(ApnMessage copy, String apnId, boolean voip, long expirationTime) {
+    this.apnId          = apnId;
+    this.number         = copy.number;
+    this.deviceId       = copy.deviceId;
+    this.message        = copy.message;
+    this.voip           = voip;
+    this.expirationTime = expirationTime;
+  }
+
+  @VisibleForTesting
+  public String getApnId() {
+    return apnId;
+  }
+
+  @VisibleForTesting
+  public boolean isVoip() {
+    return voip;
+  }
+
+  @VisibleForTesting
+  public String getMessage() {
+    return message;
+  }
+
+  @VisibleForTesting
+  public long getExpirationTime() {
+    return expirationTime;
   }
 }

src/main/java/org/whispersystems/textsecuregcm/entities/ApnRegistrationId.java

@@ -25,7 +25,14 @@ public class ApnRegistrationId {
   @NotEmpty
   private String apnRegistrationId;
 
+  @JsonProperty
+  private String voipRegistrationId;
+
   public String getApnRegistrationId() {
     return apnRegistrationId;
   }
+
+  public String getVoipRegistrationId() {
+    return voipRegistrationId;
+  }
 }

src/main/java/org/whispersystems/textsecuregcm/entities/ClientContact.java

@@ -34,12 +34,10 @@ public class ClientContact {
 
   private String  relay;
   private boolean inactive;
-  private boolean supportsSms;
 
-  public ClientContact(byte[] token, String relay, boolean supportsSms) {
-    this.token       = token;
-    this.relay       = relay;
-    this.supportsSms = supportsSms;
+  public ClientContact(byte[] token, String relay) {
+    this.token = token;
+    this.relay = relay;
   }
 
   public ClientContact() {}
@@ -56,10 +54,6 @@ public class ClientContact {
     this.relay = relay;
   }
 
-  public boolean isSupportsSms() {
-    return supportsSms;
-  }
-
   public boolean isInactive() {
     return inactive;
   }
@@ -81,7 +75,6 @@ public class ClientContact {
 
     return
         Arrays.equals(this.token, that.token) &&
-        this.supportsSms == that.supportsSms &&
         this.inactive == that.inactive &&
         (this.relay == null ? (that.relay == null) : this.relay.equals(that.relay));
   }

src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfo.java

@@ -0,0 +1,24 @@
+package org.whispersystems.textsecuregcm.entities;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class DeviceInfo {
+  @JsonProperty
+  private long id;
+
+  @JsonProperty
+  private String name;
+
+  @JsonProperty
+  private long lastSeen;
+
+  @JsonProperty
+  private long created;
+
+  public DeviceInfo(long id, String name, long lastSeen, long created) {
+    this.id       = id;
+    this.name     = name;
+    this.lastSeen = lastSeen;
+    this.created  = created;
+  }
+}

src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfoList.java

@@ -0,0 +1,15 @@
+package org.whispersystems.textsecuregcm.entities;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+public class DeviceInfoList {
+
+  @JsonProperty
+  private List<DeviceInfo> devices;
+
+  public DeviceInfoList(List<DeviceInfo> devices) {
+    this.devices = devices;
+  }
+}

src/main/java/org/whispersystems/textsecuregcm/entities/EncryptedOutgoingMessage.java

@@ -18,7 +18,7 @@ package org.whispersystems.textsecuregcm.entities;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal;
+import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
 import org.whispersystems.textsecuregcm.util.Base64;
 import org.whispersystems.textsecuregcm.util.Util;
 
@@ -44,8 +44,7 @@ public class EncryptedOutgoingMessage {
   private final byte[] serialized;
   private final String serializedAndEncoded;
 
-  public EncryptedOutgoingMessage(OutgoingMessageSignal outgoingMessage,
-                                  String signalingKey)
+  public EncryptedOutgoingMessage(Envelope outgoingMessage, String signalingKey)
       throws CryptoEncodingException
   {
     byte[]        plaintext  = outgoingMessage.toByteArray();

src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessage.java

@@ -34,9 +34,11 @@ public class IncomingMessage {
   private int destinationRegistrationId;
 
   @JsonProperty
-  @NotEmpty
   private String body;
 
+  @JsonProperty
+  private String content;
+
   @JsonProperty
   private String relay;
 
@@ -67,4 +69,8 @@ public class IncomingMessage {
   public int getDestinationRegistrationId() {
     return destinationRegistrationId;
   }
+
+  public String getContent() {
+    return content;
+  }
 }

src/main/java/org/whispersystems/textsecuregcm/entities/MessageProtos.java

@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: OutgoingMessageSignal.proto
+// source: TextSecure.proto
 
 package org.whispersystems.textsecuregcm.entities;
 
@@ -8,18 +8,18 @@ public final class MessageProtos {
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
   }
-  public interface OutgoingMessageSignalOrBuilder
+  public interface EnvelopeOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional uint32 type = 1;
+    // optional .textsecure.Envelope.Type type = 1;
     /**
-     * <code>optional uint32 type = 1;</code>
+     * <code>optional .textsecure.Envelope.Type type = 1;</code>
      */
     boolean hasType();
     /**
-     * <code>optional uint32 type = 1;</code>
+     * <code>optional .textsecure.Envelope.Type type = 1;</code>
      */
-    int getType();
+    org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Type getType();
 
     // optional string source = 2;
     /**
@@ -64,50 +64,68 @@ public final class MessageProtos {
     // optional uint64 timestamp = 5;
     /**
      * <code>optional uint64 timestamp = 5;</code>
-     *
-     * <pre>
-     *  repeated string destinations = 4;
-     * </pre>
      */
     boolean hasTimestamp();
     /**
      * <code>optional uint64 timestamp = 5;</code>
-     *
-     * <pre>
-     *  repeated string destinations = 4;
-     * </pre>
      */
     long getTimestamp();
 
-    // optional bytes message = 6;
+    // optional bytes legacyMessage = 6;
     /**
-     * <code>optional bytes message = 6;</code>
+     * <code>optional bytes legacyMessage = 6;</code>
+     *
+     * <pre>
+     * Contains an encrypted DataMessage
+     * </pre>
      */
-    boolean hasMessage();
+    boolean hasLegacyMessage();
     /**
-     * <code>optional bytes message = 6;</code>
+     * <code>optional bytes legacyMessage = 6;</code>
+     *
+     * <pre>
+     * Contains an encrypted DataMessage
+     * </pre>
      */
-    com.google.protobuf.ByteString getMessage();
+    com.google.protobuf.ByteString getLegacyMessage();
+
+    // optional bytes content = 8;
+    /**
+     * <code>optional bytes content = 8;</code>
+     *
+     * <pre>
+     * Contains an encrypted Content
+     * </pre>
+     */
+    boolean hasContent();
+    /**
+     * <code>optional bytes content = 8;</code>
+     *
+     * <pre>
+     * Contains an encrypted Content
+     * </pre>
+     */
+    com.google.protobuf.ByteString getContent();
   }
   /**
-   * Protobuf type {@code textsecure.OutgoingMessageSignal}
+   * Protobuf type {@code textsecure.Envelope}
    */
-  public static final class OutgoingMessageSignal extends
+  public static final class Envelope extends
       com.google.protobuf.GeneratedMessage
-      implements OutgoingMessageSignalOrBuilder {
-    // Use OutgoingMessageSignal.newBuilder() to construct.
-    private OutgoingMessageSignal(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      implements EnvelopeOrBuilder {
+    // Use Envelope.newBuilder() to construct.
+    private Envelope(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private OutgoingMessageSignal(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private Envelope(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final OutgoingMessageSignal defaultInstance;
-    public static OutgoingMessageSignal getDefaultInstance() {
+    private static final Envelope defaultInstance;
+    public static Envelope getDefaultInstance() {
       return defaultInstance;
     }
 
-    public OutgoingMessageSignal getDefaultInstanceForType() {
+    public Envelope getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -117,7 +135,7 @@ public final class MessageProtos {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private OutgoingMessageSignal(
+    private Envelope(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -141,8 +159,14 @@ public final class MessageProtos {
               break;
             }
             case 8: {
-              bitField0_ |= 0x00000001;
-              type_ = input.readUInt32();
+              int rawValue = input.readEnum();
+              org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Type value = org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Type.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(1, rawValue);
+              } else {
+                bitField0_ |= 0x00000001;
+                type_ = value;
+              }
               break;
             }
             case 18: {
@@ -162,7 +186,7 @@ public final class MessageProtos {
             }
             case 50: {
               bitField0_ |= 0x00000020;
-              message_ = input.readBytes();
+              legacyMessage_ = input.readBytes();
               break;
             }
             case 56: {
@@ -170,6 +194,11 @@ public final class MessageProtos {
               sourceDevice_ = input.readUInt32();
               break;
             }
+            case 66: {
+              bitField0_ |= 0x00000040;
+              content_ = input.readBytes();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -184,33 +213,33 @@ public final class MessageProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.whispersystems.textsecuregcm.entities.MessageProtos.internal_static_textsecure_OutgoingMessageSignal_descriptor;
+      return org.whispersystems.textsecuregcm.entities.MessageProtos.internal_static_textsecure_Envelope_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.whispersystems.textsecuregcm.entities.MessageProtos.internal_static_textsecure_OutgoingMessageSignal_fieldAccessorTable
+      return org.whispersystems.textsecuregcm.entities.MessageProtos.internal_static_textsecure_Envelope_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal.class, org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal.Builder.class);
+              org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.class, org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<OutgoingMessageSignal> PARSER =
-        new com.google.protobuf.AbstractParser<OutgoingMessageSignal>() {
-      public OutgoingMessageSignal parsePartialFrom(
+    public static com.google.protobuf.Parser<Envelope> PARSER =
+        new com.google.protobuf.AbstractParser<Envelope>() {
+      public Envelope parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new OutgoingMessageSignal(input, extensionRegistry);
+        return new Envelope(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<OutgoingMessageSignal> getParserForType() {
+    public com.google.protobuf.Parser<Envelope> getParserForType() {
       return PARSER;
     }
 
     /**
-     * Protobuf enum {@code textsecure.OutgoingMessageSignal.Type}
+     * Protobuf enum {@code textsecure.Envelope.Type}
      */
     public enum Type
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -230,14 +259,10 @@ public final class MessageProtos {
        * <code>PREKEY_BUNDLE = 3;</code>
        */
       PREKEY_BUNDLE(3, 3),
-      /**
-       * <code>PLAINTEXT = 4;</code>
-       */
-      PLAINTEXT(4, 4),
       /**
        * <code>RECEIPT = 5;</code>
        */
-      RECEIPT(5, 5),
+      RECEIPT(4, 5),
       ;
 
       /**
@@ -256,10 +281,6 @@ public final class MessageProtos {
        * <code>PREKEY_BUNDLE = 3;</code>
        */
       public static final int PREKEY_BUNDLE_VALUE = 3;
-      /**
-       * <code>PLAINTEXT = 4;</code>
-       */
-      public static final int PLAINTEXT_VALUE = 4;
       /**
        * <code>RECEIPT = 5;</code>
        */
@@ -274,7 +295,6 @@ public final class MessageProtos {
           case 1: return CIPHERTEXT;
           case 2: return KEY_EXCHANGE;
           case 3: return PREKEY_BUNDLE;
-          case 4: return PLAINTEXT;
           case 5: return RECEIPT;
           default: return null;
         }
@@ -302,7 +322,7 @@ public final class MessageProtos {
       }
       public static final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal.getDescriptor().getEnumTypes().get(0);
+        return org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final Type[] VALUES = values();
@@ -324,23 +344,23 @@ public final class MessageProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:textsecure.OutgoingMessageSignal.Type)
+      // @@protoc_insertion_point(enum_scope:textsecure.Envelope.Type)
     }
 
     private int bitField0_;
-    // optional uint32 type = 1;
+    // optional .textsecure.Envelope.Type type = 1;
     public static final int TYPE_FIELD_NUMBER = 1;
-    private int type_;
+    private org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Type type_;
     /**
-     * <code>optional uint32 type = 1;</code>
+     * <code>optional .textsecure.Envelope.Type type = 1;</code>
      */
     public boolean hasType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional uint32 type = 1;</code>
+     * <code>optional .textsecure.Envelope.Type type = 1;</code>
      */
-    public int getType() {
+    public org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Type getType() {
       return type_;
     }
 
@@ -451,48 +471,73 @@ public final class MessageProtos {
     private long timestamp_;
     /**
      * <code>optional uint64 timestamp = 5;</code>
-     *
-     * <pre>
-     *  repeated string destinations = 4;
-     * </pre>
      */
     public boolean hasTimestamp() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
      * <code>optional uint64 timestamp = 5;</code>
-     *
-     * <pre>
-     *  repeated string destinations = 4;
-     * </pre>
      */
     public long getTimestamp() {
       return timestamp_;
     }
 
-    // optional bytes message = 6;
-    public static final int MESSAGE_FIELD_NUMBER = 6;
-    private com.google.protobuf.ByteString message_;
+    // optional bytes legacyMessage = 6;
+    public static final int LEGACYMESSAGE_FIELD_NUMBER = 6;
+    private com.google.protobuf.ByteString legacyMessage_;
     /**
-     * <code>optional bytes message = 6;</code>
+     * <code>optional bytes legacyMessage = 6;</code>
+     *
+     * <pre>
+     * Contains an encrypted DataMessage
+     * </pre>
      */
-    public boolean hasMessage() {
+    public boolean hasLegacyMessage() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * <code>optional bytes message = 6;</code>
+     * <code>optional bytes legacyMessage = 6;</code>
+     *
+     * <pre>
+     * Contains an encrypted DataMessage
+     * </pre>
      */
-    public com.google.protobuf.ByteString getMessage() {
-      return message_;
+    public com.google.protobuf.ByteString getLegacyMessage() {
+      return legacyMessage_;
+    }
+
+    // optional bytes content = 8;
+    public static final int CONTENT_FIELD_NUMBER = 8;
+    private com.google.protobuf.ByteString content_;
+    /**
+     * <code>optional bytes content = 8;</code>
+     *
+     * <pre>
+     * Contains an encrypted Content
+     * </pre>
+     */
+    public boolean hasContent() {
+      return ((bitField0_ & 0x00000040) == 0x00000040);
+    }
+    /**
+     * <code>optional bytes content = 8;</code>
+     *
+     * <pre>
+     * Contains an encrypted Content
+     * </pre>
+     */
+    public com.google.protobuf.ByteString getContent() {
+      return content_;
     }
 
     private void initFields() {
-      type_ = 0;
+      type_ = org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Type.UNKNOWN;
       source_ = "";
       sourceDevice_ = 0;
       relay_ = "";
       timestamp_ = 0L;
-      message_ = com.google.protobuf.ByteString.EMPTY;
+      legacyMessage_ = com.google.protobuf.ByteString.EMPTY;
+      content_ = com.google.protobuf.ByteString.EMPTY;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -507,7 +552,7 @@ public final class MessageProtos {
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeUInt32(1, type_);
+        output.writeEnum(1, type_.getNumber());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeBytes(2, getSourceBytes());
@@ -519,11 +564,14 @@ public final class MessageProtos {
         output.writeUInt64(5, timestamp_);
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        output.writeBytes(6, message_);
+        output.writeBytes(6, legacyMessage_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeUInt32(7, sourceDevice_);
       }
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+        output.writeBytes(8, content_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -535,7 +583,7 @@ public final class MessageProtos {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, type_);
+          .computeEnumSize(1, type_.getNumber());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
@@ -551,12 +599,16 @@ public final class MessageProtos {
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(6, message_);
+          .computeBytesSize(6, legacyMessage_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(7, sourceDevice_);
       }
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(8, content_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -569,53 +621,53 @@ public final class MessageProtos {
       return super.writeReplace();
     }
 
-    public static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal parseFrom(
+    public static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal parseFrom(
+    public static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal parseFrom(byte[] data)
+    public static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal parseFrom(
+    public static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal parseFrom(java.io.InputStream input)
+    public static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal parseFrom(
+    public static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal parseDelimitedFrom(java.io.InputStream input)
+    public static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal parseDelimitedFrom(
+    public static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal parseFrom(
+    public static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal parseFrom(
+    public static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -624,7 +676,7 @@ public final class MessageProtos {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal prototype) {
+    public static Builder newBuilder(org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -636,24 +688,24 @@ public final class MessageProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code textsecure.OutgoingMessageSignal}
+     * Protobuf type {@code textsecure.Envelope}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignalOrBuilder {
+       implements org.whispersystems.textsecuregcm.entities.MessageProtos.EnvelopeOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.whispersystems.textsecuregcm.entities.MessageProtos.internal_static_textsecure_OutgoingMessageSignal_descriptor;
+        return org.whispersystems.textsecuregcm.entities.MessageProtos.internal_static_textsecure_Envelope_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.whispersystems.textsecuregcm.entities.MessageProtos.internal_static_textsecure_OutgoingMessageSignal_fieldAccessorTable
+        return org.whispersystems.textsecuregcm.entities.MessageProtos.internal_static_textsecure_Envelope_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal.class, org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal.Builder.class);
+                org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.class, org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Builder.class);
       }
 
-      // Construct using org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal.newBuilder()
+      // Construct using org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -673,7 +725,7 @@ public final class MessageProtos {
 
       public Builder clear() {
         super.clear();
-        type_ = 0;
+        type_ = org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Type.UNKNOWN;
         bitField0_ = (bitField0_ & ~0x00000001);
         source_ = "";
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -683,8 +735,10 @@ public final class MessageProtos {
         bitField0_ = (bitField0_ & ~0x00000008);
         timestamp_ = 0L;
         bitField0_ = (bitField0_ & ~0x00000010);
-        message_ = com.google.protobuf.ByteString.EMPTY;
+        legacyMessage_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000020);
+        content_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000040);
         return this;
       }
 
@@ -694,23 +748,23 @@ public final class MessageProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.whispersystems.textsecuregcm.entities.MessageProtos.internal_static_textsecure_OutgoingMessageSignal_descriptor;
+        return org.whispersystems.textsecuregcm.entities.MessageProtos.internal_static_textsecure_Envelope_descriptor;
       }
 
-      public org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal getDefaultInstanceForType() {
-        return org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal.getDefaultInstance();
+      public org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope getDefaultInstanceForType() {
+        return org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.getDefaultInstance();
       }
 
-      public org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal build() {
-        org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal result = buildPartial();
+      public org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope build() {
+        org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal buildPartial() {
-        org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal result = new org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal(this);
+      public org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope buildPartial() {
+        org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope result = new org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -736,23 +790,27 @@ public final class MessageProtos {
         if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
           to_bitField0_ |= 0x00000020;
         }
-        result.message_ = message_;
+        result.legacyMessage_ = legacyMessage_;
+        if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
+          to_bitField0_ |= 0x00000040;
+        }
+        result.content_ = content_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal) {
-          return mergeFrom((org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal)other);
+        if (other instanceof org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope) {
+          return mergeFrom((org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal other) {
-        if (other == org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope other) {
+        if (other == org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.getDefaultInstance()) return this;
         if (other.hasType()) {
           setType(other.getType());
         }
@@ -772,8 +830,11 @@ public final class MessageProtos {
         if (other.hasTimestamp()) {
           setTimestamp(other.getTimestamp());
         }
-        if (other.hasMessage()) {
-          setMessage(other.getMessage());
+        if (other.hasLegacyMessage()) {
+          setLegacyMessage(other.getLegacyMessage());
+        }
+        if (other.hasContent()) {
+          setContent(other.getContent());
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
@@ -787,11 +848,11 @@ public final class MessageProtos {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal parsedMessage = null;
+        org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal) e.getUnfinishedMessage();
+          parsedMessage = (org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -802,35 +863,38 @@ public final class MessageProtos {
       }
       private int bitField0_;
 
-      // optional uint32 type = 1;
-      private int type_ ;
+      // optional .textsecure.Envelope.Type type = 1;
+      private org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Type type_ = org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Type.UNKNOWN;
       /**
-       * <code>optional uint32 type = 1;</code>
+       * <code>optional .textsecure.Envelope.Type type = 1;</code>
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>optional uint32 type = 1;</code>
+       * <code>optional .textsecure.Envelope.Type type = 1;</code>
        */
-      public int getType() {
+      public org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Type getType() {
         return type_;
       }
       /**
-       * <code>optional uint32 type = 1;</code>
+       * <code>optional .textsecure.Envelope.Type type = 1;</code>
        */
-      public Builder setType(int value) {
+      public Builder setType(org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Type value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
         bitField0_ |= 0x00000001;
         type_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional uint32 type = 1;</code>
+       * <code>optional .textsecure.Envelope.Type type = 1;</code>
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        type_ = 0;
+        type_ = org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope.Type.UNKNOWN;
         onChanged();
         return this;
       }
@@ -1020,30 +1084,18 @@ public final class MessageProtos {
       private long timestamp_ ;
       /**
        * <code>optional uint64 timestamp = 5;</code>
-       *
-       * <pre>
-       *  repeated string destinations = 4;
-       * </pre>
        */
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
        * <code>optional uint64 timestamp = 5;</code>
-       *
-       * <pre>
-       *  repeated string destinations = 4;
-       * </pre>
        */
       public long getTimestamp() {
         return timestamp_;
       }
       /**
        * <code>optional uint64 timestamp = 5;</code>
-       *
-       * <pre>
-       *  repeated string destinations = 4;
-       * </pre>
        */
       public Builder setTimestamp(long value) {
         bitField0_ |= 0x00000010;
@@ -1053,10 +1105,6 @@ public final class MessageProtos {
       }
       /**
        * <code>optional uint64 timestamp = 5;</code>
-       *
-       * <pre>
-       *  repeated string destinations = 4;
-       * </pre>
        */
       public Builder clearTimestamp() {
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -1065,51 +1113,119 @@ public final class MessageProtos {
         return this;
       }
 
-      // optional bytes message = 6;
-      private com.google.protobuf.ByteString message_ = com.google.protobuf.ByteString.EMPTY;
+      // optional bytes legacyMessage = 6;
+      private com.google.protobuf.ByteString legacyMessage_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes message = 6;</code>
+       * <code>optional bytes legacyMessage = 6;</code>
+       *
+       * <pre>
+       * Contains an encrypted DataMessage
+       * </pre>
        */
-      public boolean hasMessage() {
+      public boolean hasLegacyMessage() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * <code>optional bytes message = 6;</code>
+       * <code>optional bytes legacyMessage = 6;</code>
+       *
+       * <pre>
+       * Contains an encrypted DataMessage
+       * </pre>
        */
-      public com.google.protobuf.ByteString getMessage() {
-        return message_;
+      public com.google.protobuf.ByteString getLegacyMessage() {
+        return legacyMessage_;
       }
       /**
-       * <code>optional bytes message = 6;</code>
+       * <code>optional bytes legacyMessage = 6;</code>
+       *
+       * <pre>
+       * Contains an encrypted DataMessage
+       * </pre>
        */
-      public Builder setMessage(com.google.protobuf.ByteString value) {
+      public Builder setLegacyMessage(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   bitField0_ |= 0x00000020;
-        message_ = value;
+        legacyMessage_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional bytes message = 6;</code>
+       * <code>optional bytes legacyMessage = 6;</code>
+       *
+       * <pre>
+       * Contains an encrypted DataMessage
+       * </pre>
        */
-      public Builder clearMessage() {
+      public Builder clearLegacyMessage() {
         bitField0_ = (bitField0_ & ~0x00000020);
-        message_ = getDefaultInstance().getMessage();
+        legacyMessage_ = getDefaultInstance().getLegacyMessage();
         onChanged();
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:textsecure.OutgoingMessageSignal)
+      // optional bytes content = 8;
+      private com.google.protobuf.ByteString content_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>optional bytes content = 8;</code>
+       *
+       * <pre>
+       * Contains an encrypted Content
+       * </pre>
+       */
+      public boolean hasContent() {
+        return ((bitField0_ & 0x00000040) == 0x00000040);
+      }
+      /**
+       * <code>optional bytes content = 8;</code>
+       *
+       * <pre>
+       * Contains an encrypted Content
+       * </pre>
+       */
+      public com.google.protobuf.ByteString getContent() {
+        return content_;
+      }
+      /**
+       * <code>optional bytes content = 8;</code>
+       *
+       * <pre>
+       * Contains an encrypted Content
+       * </pre>
+       */
+      public Builder setContent(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000040;
+        content_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bytes content = 8;</code>
+       *
+       * <pre>
+       * Contains an encrypted Content
+       * </pre>
+       */
+      public Builder clearContent() {
+        bitField0_ = (bitField0_ & ~0x00000040);
+        content_ = getDefaultInstance().getContent();
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:textsecure.Envelope)
     }
 
     static {
-      defaultInstance = new OutgoingMessageSignal(true);
+      defaultInstance = new Envelope(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:textsecure.OutgoingMessageSignal)
+    // @@protoc_insertion_point(class_scope:textsecure.Envelope)
   }
 
   public interface ProvisioningUuidOrBuilder
@@ -1584,10 +1700,10 @@ public final class MessageProtos {
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_textsecure_OutgoingMessageSignal_descriptor;
+    internal_static_textsecure_Envelope_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_textsecure_OutgoingMessageSignal_fieldAccessorTable;
+      internal_static_textsecure_Envelope_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_textsecure_ProvisioningUuid_descriptor;
   private static
@@ -1602,28 +1718,28 @@ public final class MessageProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\033OutgoingMessageSignal.proto\022\ntextsecur" +
-      "e\"\344\001\n\025OutgoingMessageSignal\022\014\n\004type\030\001 \001(" +
-      "\r\022\016\n\006source\030\002 \001(\t\022\024\n\014sourceDevice\030\007 \001(\r\022" +
-      "\r\n\005relay\030\003 \001(\t\022\021\n\ttimestamp\030\005 \001(\004\022\017\n\007mes" +
-      "sage\030\006 \001(\014\"d\n\004Type\022\013\n\007UNKNOWN\020\000\022\016\n\nCIPHE" +
-      "RTEXT\020\001\022\020\n\014KEY_EXCHANGE\020\002\022\021\n\rPREKEY_BUND" +
-      "LE\020\003\022\r\n\tPLAINTEXT\020\004\022\013\n\007RECEIPT\020\005\" \n\020Prov" +
-      "isioningUuid\022\014\n\004uuid\030\001 \001(\tB:\n)org.whispe" +
-      "rsystems.textsecuregcm.entitiesB\rMessage" +
-      "Protos"
+      "\n\020TextSecure.proto\022\ntextsecure\"\372\001\n\010Envel" +
+      "ope\022\'\n\004type\030\001 \001(\0162\031.textsecure.Envelope." +
+      "Type\022\016\n\006source\030\002 \001(\t\022\024\n\014sourceDevice\030\007 \001" +
+      "(\r\022\r\n\005relay\030\003 \001(\t\022\021\n\ttimestamp\030\005 \001(\004\022\025\n\r" +
+      "legacyMessage\030\006 \001(\014\022\017\n\007content\030\010 \001(\014\"U\n\004" +
+      "Type\022\013\n\007UNKNOWN\020\000\022\016\n\nCIPHERTEXT\020\001\022\020\n\014KEY" +
+      "_EXCHANGE\020\002\022\021\n\rPREKEY_BUNDLE\020\003\022\013\n\007RECEIP" +
+      "T\020\005\" \n\020ProvisioningUuid\022\014\n\004uuid\030\001 \001(\tB:\n" +
+      ")org.whispersystems.textsecuregcm.entiti" +
+      "esB\rMessageProtos"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_textsecure_OutgoingMessageSignal_descriptor =
+          internal_static_textsecure_Envelope_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_textsecure_OutgoingMessageSignal_fieldAccessorTable = new
+          internal_static_textsecure_Envelope_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_textsecure_OutgoingMessageSignal_descriptor,
-              new java.lang.String[] { "Type", "Source", "SourceDevice", "Relay", "Timestamp", "Message", });
+              internal_static_textsecure_Envelope_descriptor,
+              new java.lang.String[] { "Type", "Source", "SourceDevice", "Relay", "Timestamp", "LegacyMessage", "Content", });
           internal_static_textsecure_ProvisioningUuid_descriptor =
             getDescriptor().getMessageTypes().get(1);
           internal_static_textsecure_ProvisioningUuid_fieldAccessorTable = new

src/main/java/org/whispersystems/textsecuregcm/entities/OutgoingMessageEntity.java

@@ -0,0 +1,80 @@
+package org.whispersystems.textsecuregcm.entities;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class OutgoingMessageEntity {
+
+  @JsonIgnore
+  private long id;
+
+  @JsonProperty
+  private int type;
+
+  @JsonProperty
+  private String relay;
+
+  @JsonProperty
+  private long timestamp;
+
+  @JsonProperty
+  private String source;
+
+  @JsonProperty
+  private int sourceDevice;
+
+  @JsonProperty
+  private byte[] message;
+
+  @JsonProperty
+  private byte[] content;
+
+  public OutgoingMessageEntity() {}
+
+  public OutgoingMessageEntity(long id, int type, String relay, long timestamp,
+                               String source, int sourceDevice, byte[] message,
+                               byte[] content)
+  {
+    this.id           = id;
+    this.type         = type;
+    this.relay        = relay;
+    this.timestamp    = timestamp;
+    this.source       = source;
+    this.sourceDevice = sourceDevice;
+    this.message      = message;
+    this.content      = content;
+  }
+
+  public int getType() {
+    return type;
+  }
+
+  public String getRelay() {
+    return relay;
+  }
+
+  public long getTimestamp() {
+    return timestamp;
+  }
+
+  public String getSource() {
+    return source;
+  }
+
+  public int getSourceDevice() {
+    return sourceDevice;
+  }
+
+  public byte[] getMessage() {
+    return message;
+  }
+
+  public byte[] getContent() {
+    return content;
+  }
+
+  public long getId() {
+    return id;
+  }
+
+}

src/main/java/org/whispersystems/textsecuregcm/entities/OutgoingMessageEntityList.java

@@ -0,0 +1,23 @@
+package org.whispersystems.textsecuregcm.entities;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.annotations.VisibleForTesting;
+
+import java.util.List;
+
+public class OutgoingMessageEntityList {
+
+  @JsonProperty
+  private List<OutgoingMessageEntity> messages;
+
+  public OutgoingMessageEntityList() {}
+
+  public OutgoingMessageEntityList(List<OutgoingMessageEntity> messages) {
+    this.messages = messages;
+  }
+
+  @VisibleForTesting
+  public List<OutgoingMessageEntity> getMessages() {
+    return messages;
+  }
+}

src/main/java/org/whispersystems/textsecuregcm/entities/UnregisteredEvent.java

@@ -11,6 +11,9 @@ public class UnregisteredEvent {
   @NotEmpty
   private String registrationId;
 
+  @JsonProperty
+  private String canonicalId;
+
   @JsonProperty
   @NotEmpty
   private String number;
@@ -26,6 +29,10 @@ public class UnregisteredEvent {
     return registrationId;
   }
 
+  public String getCanonicalId() {
+    return canonicalId;
+  }
+
   public String getNumber() {
     return number;
   }

src/main/java/org/whispersystems/textsecuregcm/federation/NonLimitedAccount.java

@@ -40,6 +40,6 @@ public class NonLimitedAccount extends Account {
 
   @Override
   public Optional<Device> getAuthenticatedDevice() {
-    return Optional.of(new Device(deviceId, null, null, null, null, null, false, 0, null, System.currentTimeMillis()));
+    return Optional.of(new Device(deviceId, null, null, null, null, null, null, null, false, 0, null, System.currentTimeMillis(), System.currentTimeMillis()));
   }
 }

src/main/java/org/whispersystems/textsecuregcm/mappers/DeviceLimitExceededExceptionMapper.java

@@ -0,0 +1,33 @@
+package org.whispersystems.textsecuregcm.mappers;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.whispersystems.textsecuregcm.controllers.DeviceLimitExceededException;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class DeviceLimitExceededExceptionMapper implements ExceptionMapper<DeviceLimitExceededException> {
+  @Override
+  public Response toResponse(DeviceLimitExceededException exception) {
+    return Response.status(411)
+                   .entity(new DeviceLimitExceededDetails(exception.getCurrentDevices(),
+                                                          exception.getMaxDevices()))
+                   .build();
+  }
+
+  private static class DeviceLimitExceededDetails {
+    @JsonProperty
+    private int current;
+    @JsonProperty
+    private int max;
+
+    public DeviceLimitExceededDetails(int current, int max) {
+      this.current = current;
+      this.max     = max;
+    }
+  }
+}

src/main/java/org/whispersystems/textsecuregcm/providers/RedisClientFactory.java

@@ -16,8 +16,14 @@
  */
 package org.whispersystems.textsecuregcm.providers;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.dispatch.io.RedisPubSubConnectionFactory;
+import org.whispersystems.dispatch.redis.PubSubConnection;
 import org.whispersystems.textsecuregcm.util.Util;
 
+import java.io.IOException;
+import java.net.Socket;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -25,29 +31,40 @@ import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
 import redis.clients.jedis.Protocol;
 
-public class RedisClientFactory {
+public class RedisClientFactory implements RedisPubSubConnectionFactory {
 
+  private final Logger logger = LoggerFactory.getLogger(RedisClientFactory.class);
+
+  private final String    host;
+  private final int       port;
   private final JedisPool jedisPool;
 
   public RedisClientFactory(String url) throws URISyntaxException {
     JedisPoolConfig poolConfig = new JedisPoolConfig();
     poolConfig.setTestOnBorrow(true);
 
-    URI    redisURI      = new URI(url);
-    String redisHost     = redisURI.getHost();
-    int    redisPort     = redisURI.getPort();
-    String redisPassword = null;
+    URI redisURI = new URI(url);
 
-    if (!Util.isEmpty(redisURI.getUserInfo())) {
-      redisPassword = redisURI.getUserInfo().split(":",2)[1];
-    }
-
-    this.jedisPool = new JedisPool(poolConfig, redisHost, redisPort,
-                                   Protocol.DEFAULT_TIMEOUT, redisPassword);
+    this.host      = redisURI.getHost();
+    this.port      = redisURI.getPort();
+    this.jedisPool = new JedisPool(poolConfig, host, port,
+                                   Protocol.DEFAULT_TIMEOUT, null);
   }
 
   public JedisPool getRedisClientPool() {
     return jedisPool;
   }
 
+  @Override
+  public PubSubConnection connect() {
+    while (true) {
+      try {
+        Socket socket = new Socket(host, port);
+        return new PubSubConnection(socket);
+      } catch (IOException e) {
+        logger.warn("Error connecting", e);
+        Util.sleep(200);
+      }
+    }
+  }
 }

src/main/java/org/whispersystems/textsecuregcm/push/ApnFallbackManager.java

@@ -0,0 +1,180 @@
+package org.whispersystems.textsecuregcm.push;
+
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.RatioGauge;
+import com.codahale.metrics.SharedMetricRegistries;
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.textsecuregcm.entities.ApnMessage;
+import org.whispersystems.textsecuregcm.util.Constants;
+import org.whispersystems.textsecuregcm.util.Util;
+import org.whispersystems.textsecuregcm.websocket.WebsocketAddress;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+
+import static com.codahale.metrics.MetricRegistry.name;
+import io.dropwizard.lifecycle.Managed;
+
+public class ApnFallbackManager implements Managed, Runnable {
+
+  private static final Logger logger = LoggerFactory.getLogger(ApnFallbackManager.class);
+
+  private static final MetricRegistry metricRegistry          = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
+  private static final Meter          voipOneSuccess          = metricRegistry.meter(name(ApnFallbackManager.class, "voip_one_success"));
+  private static final Meter          voipOneDelivery         = metricRegistry.meter(name(ApnFallbackManager.class, "voip_one_failure"));
+  private static final Histogram      voipOneSuccessHistogram = metricRegistry.histogram(name(ApnFallbackManager.class, "voip_one_success_histogram"));
+
+  static {
+    metricRegistry.register(name(ApnFallbackManager.class, "voip_one_success_ratio"), new VoipRatioGauge(voipOneSuccess, voipOneDelivery));
+  }
+
+  private final ApnFallbackTaskQueue taskQueue = new ApnFallbackTaskQueue();
+  private final PushServiceClient pushServiceClient;
+
+  public ApnFallbackManager(PushServiceClient pushServiceClient) {
+    this.pushServiceClient = pushServiceClient;
+  }
+
+  public void schedule(final WebsocketAddress address, ApnFallbackTask task) {
+    voipOneDelivery.mark();
+    taskQueue.put(address, task);
+  }
+
+  public void cancel(WebsocketAddress address) {
+    ApnFallbackTask task = taskQueue.remove(address);
+
+    if (task != null) {
+      voipOneSuccess.mark();
+      voipOneSuccessHistogram.update(System.currentTimeMillis() - task.getScheduledTime());
+    }
+  }
+
+  @Override
+  public void start() throws Exception {
+    new Thread(this).start();
+  }
+
+  @Override
+  public void stop() throws Exception {
+
+  }
+
+  @Override
+  public void run() {
+    while (true) {
+      try {
+        Entry<WebsocketAddress, ApnFallbackTask> taskEntry  = taskQueue.get();
+        ApnFallbackTask                          task       = taskEntry.getValue();
+
+        pushServiceClient.send(new ApnMessage(task.getMessage(), task.getApnId(),
+                                              false, ApnMessage.MAX_EXPIRATION));
+      } catch (Throwable e) {
+        logger.warn("ApnFallbackThread", e);
+      }
+    }
+  }
+
+  public static class ApnFallbackTask {
+
+    private final long       delay;
+    private final long       scheduledTime;
+    private final String     apnId;
+    private final ApnMessage message;
+
+    public ApnFallbackTask(String apnId, ApnMessage message) {
+      this(apnId, message, TimeUnit.SECONDS.toMillis(30));
+    }
+
+    @VisibleForTesting
+    public ApnFallbackTask(String apnId, ApnMessage message, long delay) {
+      this.scheduledTime = System.currentTimeMillis();
+      this.delay         = delay;
+      this.apnId         = apnId;
+      this.message       = message;
+    }
+
+    public String getApnId() {
+      return apnId;
+    }
+
+    public ApnMessage getMessage() {
+      return message;
+    }
+
+    public long getScheduledTime() {
+      return scheduledTime;
+    }
+
+    public long getExecutionTime() {
+      return scheduledTime + delay;
+    }
+
+    public long getDelay() {
+      return delay;
+    }
+  }
+
+  @VisibleForTesting
+  public static class ApnFallbackTaskQueue {
+
+    private final LinkedHashMap<WebsocketAddress, ApnFallbackTask> tasks = new LinkedHashMap<>();
+
+    public Entry<WebsocketAddress, ApnFallbackTask> get() {
+      while (true) {
+        long timeDelta;
+
+        synchronized (tasks) {
+          while (tasks.isEmpty()) Util.wait(tasks);
+
+          Iterator<Entry<WebsocketAddress, ApnFallbackTask>> iterator  = tasks.entrySet().iterator();
+          Entry<WebsocketAddress, ApnFallbackTask>           nextTask  = iterator.next();
+
+          timeDelta = nextTask.getValue().getExecutionTime() - System.currentTimeMillis();
+
+          if (timeDelta <= 0) {
+            iterator.remove();
+            return nextTask;
+          }
+        }
+
+        Util.sleep(timeDelta);
+      }
+    }
+
+    public void put(WebsocketAddress address, ApnFallbackTask task) {
+      synchronized (tasks) {
+        tasks.put(address, task);
+        tasks.notifyAll();
+      }
+    }
+
+    public ApnFallbackTask remove(WebsocketAddress address) {
+      synchronized (tasks) {
+        return tasks.remove(address);
+      }
+    }
+  }
+
+  private static class VoipRatioGauge extends RatioGauge {
+
+    private final Meter success;
+    private final Meter attempts;
+
+    private VoipRatioGauge(Meter success, Meter attempts) {
+      this.success  = success;
+      this.attempts = attempts;
+    }
+
+    @Override
+    protected Ratio getRatio() {
+      return Ratio.of(success.getFiveMinuteRate(), attempts.getFiveMinuteRate());
+    }
+  }
+
+}

src/main/java/org/whispersystems/textsecuregcm/push/FeedbackHandler.java

@@ -76,7 +76,13 @@ public class FeedbackHandler implements Managed, Runnable {
               event.getTimestamp() > device.get().getPushTimestamp())
           {
             logger.info("GCM Unregister Timestamp matches!");
-            device.get().setGcmId(null);
+
+            if (event.getCanonicalId() != null && !event.getCanonicalId().isEmpty()) {
+              logger.info("It's a canonical ID update...");
+              device.get().setGcmId(event.getCanonicalId());
+            } else {
+              device.get().setGcmId(null);
+            }
             accountsManager.update(account.get());
           }
         }

src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java

@@ -22,11 +22,16 @@ import org.whispersystems.textsecuregcm.entities.ApnMessage;
 import org.whispersystems.textsecuregcm.entities.CryptoEncodingException;
 import org.whispersystems.textsecuregcm.entities.EncryptedOutgoingMessage;
 import org.whispersystems.textsecuregcm.entities.GcmMessage;
+import org.whispersystems.textsecuregcm.push.ApnFallbackManager.ApnFallbackTask;
 import org.whispersystems.textsecuregcm.push.WebsocketSender.DeliveryStatus;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.Device;
+import org.whispersystems.textsecuregcm.util.Util;
+import org.whispersystems.textsecuregcm.websocket.WebsocketAddress;
 
-import static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal;
+import java.util.concurrent.TimeUnit;
+
+import static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
 
 public class PushSender {
 
@@ -34,15 +39,17 @@ public class PushSender {
 
   private static final String APN_PAYLOAD = "{\"aps\":{\"sound\":\"default\",\"badge\":%d,\"alert\":{\"loc-key\":\"APN_Message\"}}}";
 
-  private final PushServiceClient pushServiceClient;
-  private final WebsocketSender   webSocketSender;
+  private final ApnFallbackManager apnFallbackManager;
+  private final PushServiceClient  pushServiceClient;
+  private final WebsocketSender    webSocketSender;
 
-  public PushSender(PushServiceClient pushServiceClient, WebsocketSender websocketSender) {
-    this.pushServiceClient = pushServiceClient;
-    this.webSocketSender   = websocketSender;
+  public PushSender(ApnFallbackManager apnFallbackManager, PushServiceClient pushServiceClient, WebsocketSender websocketSender) {
+    this.apnFallbackManager = apnFallbackManager;
+    this.pushServiceClient  = pushServiceClient;
+    this.webSocketSender    = websocketSender;
   }
 
-  public void sendMessage(Account account, Device device, OutgoingMessageSignal message)
+  public void sendMessage(Account account, Device device, Envelope message)
       throws NotPushRegisteredException, TransientPushFailureException
   {
     if      (device.getGcmId() != null)   sendGcmMessage(account, device, message);
@@ -55,21 +62,21 @@ public class PushSender {
     return webSocketSender;
   }
 
-  private void sendGcmMessage(Account account, Device device, OutgoingMessageSignal message)
+  private void sendGcmMessage(Account account, Device device, Envelope message)
       throws TransientPushFailureException, NotPushRegisteredException
   {
     if (device.getFetchesMessages()) sendNotificationGcmMessage(account, device, message);
     else                             sendPayloadGcmMessage(account, device, message);
   }
 
-  private void sendPayloadGcmMessage(Account account, Device device, OutgoingMessageSignal message)
+  private void sendPayloadGcmMessage(Account account, Device device, Envelope message)
       throws TransientPushFailureException, NotPushRegisteredException
   {
     try {
       String                   number           = account.getNumber();
       long                     deviceId         = device.getId();
       String                   registrationId   = device.getGcmId();
-      boolean                  isReceipt        = message.getType() == OutgoingMessageSignal.Type.RECEIPT_VALUE;
+      boolean                  isReceipt        = message.getType() == Envelope.Type.RECEIPT;
       EncryptedOutgoingMessage encryptedMessage = new EncryptedOutgoingMessage(message, device.getSignalingKey());
       GcmMessage               gcmMessage       = new GcmMessage(registrationId, number, (int) deviceId,
                                                                  encryptedMessage.toEncodedString(), isReceipt, false);
@@ -80,7 +87,7 @@ public class PushSender {
     }
   }
 
-  private void sendNotificationGcmMessage(Account account, Device device, OutgoingMessageSignal message)
+  private void sendNotificationGcmMessage(Account account, Device device, Envelope message)
       throws TransientPushFailureException
   {
     DeliveryStatus deliveryStatus = webSocketSender.sendMessage(account, device, message, WebsocketSender.Type.GCM);
@@ -93,19 +100,32 @@ public class PushSender {
     }
   }
 
-  private void sendApnMessage(Account account, Device device, OutgoingMessageSignal outgoingMessage)
+  private void sendApnMessage(Account account, Device device, Envelope outgoingMessage)
       throws TransientPushFailureException
   {
     DeliveryStatus deliveryStatus = webSocketSender.sendMessage(account, device, outgoingMessage, WebsocketSender.Type.APN);
 
-    if (!deliveryStatus.isDelivered() && outgoingMessage.getType() != OutgoingMessageSignal.Type.RECEIPT_VALUE) {
-      ApnMessage apnMessage = new ApnMessage(device.getApnId(), account.getNumber(), (int)device.getId(),
-                                             String.format(APN_PAYLOAD, deliveryStatus.getMessageQueueDepth()));
+    if (!deliveryStatus.isDelivered() && outgoingMessage.getType() != Envelope.Type.RECEIPT) {
+      ApnMessage apnMessage;
+
+      if (!Util.isEmpty(device.getVoipApnId())) {
+        apnMessage = new ApnMessage(device.getVoipApnId(), account.getNumber(), (int)device.getId(),
+                                    String.format(APN_PAYLOAD, deliveryStatus.getMessageQueueDepth()),
+                                    true, System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(30));
+
+        apnFallbackManager.schedule(new WebsocketAddress(account.getNumber(), device.getId()),
+                                    new ApnFallbackTask(device.getApnId(), apnMessage));
+      } else {
+        apnMessage = new ApnMessage(device.getApnId(), account.getNumber(), (int)device.getId(),
+                                    String.format(APN_PAYLOAD, deliveryStatus.getMessageQueueDepth()),
+                                    false, ApnMessage.MAX_EXPIRATION);
+      }
+
       pushServiceClient.send(apnMessage);
     }
   }
 
-  private void sendWebSocketMessage(Account account, Device device, OutgoingMessageSignal outgoingMessage)
+  private void sendWebSocketMessage(Account account, Device device, Envelope outgoingMessage)
   {
     webSocketSender.sendMessage(account, device, outgoingMessage, WebsocketSender.Type.WEB);
   }

src/main/java/org/whispersystems/textsecuregcm/push/ReceiptSender.java

@@ -0,0 +1,87 @@
+package org.whispersystems.textsecuregcm.push;
+
+import com.google.common.base.Optional;
+import org.whispersystems.textsecuregcm.controllers.NoSuchUserException;
+import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
+import org.whispersystems.textsecuregcm.federation.FederatedClientManager;
+import org.whispersystems.textsecuregcm.federation.NoSuchPeerException;
+import org.whispersystems.textsecuregcm.storage.Account;
+import org.whispersystems.textsecuregcm.storage.AccountsManager;
+import org.whispersystems.textsecuregcm.storage.Device;
+
+import java.io.IOException;
+import java.util.Set;
+
+public class ReceiptSender {
+
+  private final PushSender             pushSender;
+  private final FederatedClientManager federatedClientManager;
+  private final AccountsManager        accountManager;
+
+  public ReceiptSender(AccountsManager        accountManager,
+                       PushSender             pushSender,
+                       FederatedClientManager federatedClientManager)
+  {
+    this.federatedClientManager = federatedClientManager;
+    this.accountManager         = accountManager;
+    this.pushSender             = pushSender;
+  }
+
+  public void sendReceipt(Account source, String destination,
+                          long messageId, Optional<String> relay)
+      throws IOException, NoSuchUserException,
+             NotPushRegisteredException, TransientPushFailureException
+  {
+    if (relay.isPresent() && !relay.get().isEmpty()) {
+      sendRelayedReceipt(source, destination, messageId, relay.get());
+    } else {
+      sendDirectReceipt(source, destination, messageId);
+    }
+  }
+
+  private void sendRelayedReceipt(Account source, String destination, long messageId, String relay)
+      throws NoSuchUserException, IOException
+  {
+    try {
+      federatedClientManager.getClient(relay)
+                            .sendDeliveryReceipt(source.getNumber(),
+                                                 source.getAuthenticatedDevice().get().getId(),
+                                                 destination, messageId);
+    } catch (NoSuchPeerException e) {
+      throw new NoSuchUserException(e);
+    }
+  }
+
+  private void sendDirectReceipt(Account source, String destination, long messageId)
+      throws NotPushRegisteredException, TransientPushFailureException, NoSuchUserException
+  {
+    Account          destinationAccount = getDestinationAccount(destination);
+    Set<Device>      destinationDevices = destinationAccount.getDevices();
+    Envelope.Builder message            = Envelope.newBuilder()
+                                                  .setSource(source.getNumber())
+                                                  .setSourceDevice((int) source.getAuthenticatedDevice().get().getId())
+                                                  .setTimestamp(messageId)
+                                                  .setType(Envelope.Type.RECEIPT);
+
+    if (source.getRelay().isPresent()) {
+      message.setRelay(source.getRelay().get());
+    }
+
+    for (Device destinationDevice : destinationDevices) {
+      pushSender.sendMessage(destinationAccount, destinationDevice, message.build());
+    }
+  }
+
+  private Account getDestinationAccount(String destination)
+      throws NoSuchUserException
+  {
+    Optional<Account> account = accountManager.get(destination);
+
+    if (!account.isPresent()) {
+      throw new NoSuchUserException(destination);
+    }
+
+    return account.get();
+  }
+
+}

src/main/java/org/whispersystems/textsecuregcm/push/WebsocketSender.java

@@ -31,7 +31,7 @@ import org.whispersystems.textsecuregcm.websocket.ProvisioningAddress;
 import org.whispersystems.textsecuregcm.websocket.WebsocketAddress;
 
 import static com.codahale.metrics.MetricRegistry.name;
-import static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal;
+import static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
 import static org.whispersystems.textsecuregcm.storage.PubSubProtos.PubSubMessage;
 
 public class WebsocketSender {
@@ -66,7 +66,7 @@ public class WebsocketSender {
     this.pubSubManager   = pubSubManager;
   }
 
-  public DeliveryStatus sendMessage(Account account, Device device, OutgoingMessageSignal message, Type channel) {
+  public DeliveryStatus sendMessage(Account account, Device device, Envelope message, Type channel) {
     WebsocketAddress address       = new WebsocketAddress(account.getNumber(), device.getId());
     PubSubMessage    pubSubMessage = PubSubMessage.newBuilder()
                                                   .setType(PubSubMessage.Type.DELIVER)

src/main/java/org/whispersystems/textsecuregcm/storage/Account.java

@@ -32,9 +32,6 @@ public class Account {
   @JsonProperty
   private String number;
 
-  @JsonProperty
-  private boolean supportsSms;
-
   @JsonProperty
   private Set<Device> devices = new HashSet<>();
 
@@ -47,10 +44,9 @@ public class Account {
   public Account() {}
 
   @VisibleForTesting
-  public Account(String number, boolean supportsSms, Set<Device> devices) {
-    this.number      = number;
-    this.supportsSms = supportsSms;
-    this.devices     = devices;
+  public Account(String number, Set<Device> devices) {
+    this.number  = number;
+    this.devices = devices;
   }
 
   public Optional<Device> getAuthenticatedDevice() {
@@ -69,19 +65,15 @@ public class Account {
     return number;
   }
 
-  public boolean getSupportsSms() {
-    return supportsSms;
-  }
-
-  public void setSupportsSms(boolean supportsSms) {
-    this.supportsSms = supportsSms;
-  }
-
   public void addDevice(Device device) {
     this.devices.remove(device);
     this.devices.add(device);
   }
 
+  public void removeDevice(long deviceId) {
+    this.devices.remove(new Device(deviceId, null, null, null, null, null, null, null, false, 0, null, 0, 0));
+  }
+
   public Set<Device> getDevices() {
     return devices;
   }

src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java

@@ -100,7 +100,7 @@ public class AccountsManager {
   private void updateDirectory(Account account) {
     if (account.isActive()) {
       byte[]        token         = Util.getContactToken(account.getNumber());
-      ClientContact clientContact = new ClientContact(token, null, account.getSupportsSms());
+      ClientContact clientContact = new ClientContact(token, null);
       directory.add(clientContact);
     } else {
       directory.remove(account.getNumber());

src/main/java/org/whispersystems/textsecuregcm/storage/Device.java

@@ -31,6 +31,9 @@ public class Device {
   @JsonProperty
   private long    id;
 
+  @JsonProperty
+  private String  name;
+
   @JsonProperty
   private String  authToken;
 
@@ -46,6 +49,9 @@ public class Device {
   @JsonProperty
   private String  apnId;
 
+  @JsonProperty
+  private String  voipApnId;
+
   @JsonProperty
   private long pushTimestamp;
 
@@ -61,23 +67,30 @@ public class Device {
   @JsonProperty
   private long lastSeen;
 
+  @JsonProperty
+  private long created;
+
   public Device() {}
 
-  public Device(long id, String authToken, String salt,
+  public Device(long id, String name, String authToken, String salt,
                 String signalingKey, String gcmId, String apnId,
-                boolean fetchesMessages, int registrationId,
-                SignedPreKey signedPreKey, long lastSeen)
+                String voipApnId, boolean fetchesMessages,
+                int registrationId, SignedPreKey signedPreKey,
+                long lastSeen, long created)
   {
     this.id              = id;
+    this.name            = name;
     this.authToken       = authToken;
     this.salt            = salt;
     this.signalingKey    = signalingKey;
     this.gcmId           = gcmId;
     this.apnId           = apnId;
+    this.voipApnId       = voipApnId;
     this.fetchesMessages = fetchesMessages;
     this.registrationId  = registrationId;
     this.signedPreKey    = signedPreKey;
     this.lastSeen        = lastSeen;
+    this.created         = created;
   }
 
   public String getApnId() {
@@ -92,6 +105,14 @@ public class Device {
     }
   }
 
+  public String getVoipApnId() {
+    return voipApnId;
+  }
+
+  public void setVoipApnId(String voipApnId) {
+    this.voipApnId = voipApnId;
+  }
+
   public void setLastSeen(long lastSeen) {
     this.lastSeen = lastSeen;
   }
@@ -100,6 +121,14 @@ public class Device {
     return lastSeen;
   }
 
+  public void setCreated(long created) {
+    this.created = created;
+  }
+
+  public long getCreated() {
+    return this.created;
+  }
+
   public String getGcmId() {
     return gcmId;
   }
@@ -120,6 +149,14 @@ public class Device {
     this.id = id;
   }
 
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
   public void setAuthenticationCredentials(AuthenticationCredentials credentials) {
     this.authToken = credentials.getHashedAuthenticationToken();
     this.salt      = credentials.getSalt();

src/main/java/org/whispersystems/textsecuregcm/storage/DirectoryManager.java

@@ -72,7 +72,7 @@ public class DirectoryManager {
   }
 
   public void add(ClientContact contact) {
-    TokenValue tokenValue = new TokenValue(contact.getRelay(), contact.isSupportsSms());
+    TokenValue tokenValue = new TokenValue(contact.getRelay());
 
     try (Jedis jedis = redisPool.getResource()) {
       jedis.hset(DIRECTORY_KEY, contact.getToken(), objectMapper.writeValueAsBytes(tokenValue));
@@ -84,7 +84,7 @@ public class DirectoryManager {
   public void add(BatchOperationHandle handle, ClientContact contact) {
     try {
       Pipeline   pipeline   = handle.pipeline;
-      TokenValue tokenValue = new TokenValue(contact.getRelay(), contact.isSupportsSms());
+      TokenValue tokenValue = new TokenValue(contact.getRelay());
 
       pipeline.hset(DIRECTORY_KEY, contact.getToken(), objectMapper.writeValueAsBytes(tokenValue));
     } catch (JsonProcessingException e) {
@@ -106,7 +106,7 @@ public class DirectoryManager {
       }
 
       TokenValue tokenValue = objectMapper.readValue(result, TokenValue.class);
-      return Optional.of(new ClientContact(token, tokenValue.relay, tokenValue.supportsSms));
+      return Optional.of(new ClientContact(token, tokenValue.relay));
     } catch (IOException e) {
       logger.warn("JSON Error", e);
       return Optional.absent();
@@ -133,7 +133,7 @@ public class DirectoryManager {
         try {
           if (pair.second().get() != null) {
             TokenValue    tokenValue    = objectMapper.readValue(pair.second().get(), TokenValue.class);
-            ClientContact clientContact = new ClientContact(pair.first(), tokenValue.relay, tokenValue.supportsSms);
+            ClientContact clientContact = new ClientContact(pair.first(), tokenValue.relay);
 
             results.add(clientContact);
           }
@@ -175,14 +175,10 @@ public class DirectoryManager {
     @JsonProperty(value = "r")
     private String  relay;
 
-    @JsonProperty(value = "s")
-    private boolean supportsSms;
-
     public TokenValue() {}
 
-    public TokenValue(String relay, boolean supportsSms) {
-      this.relay       = relay;
-      this.supportsSms = supportsSms;
+    public TokenValue(String relay) {
+      this.relay = relay;
     }
   }
 
@@ -205,7 +201,7 @@ public class DirectoryManager {
       }
 
       TokenValue tokenValue = objectMapper.readValue(result, TokenValue.class);
-      return Optional.of(new ClientContact(token, tokenValue.relay, tokenValue.supportsSms));
+      return Optional.of(new ClientContact(token, tokenValue.relay));
     }
 
   }

src/main/java/org/whispersystems/textsecuregcm/storage/Messages.java

@@ -1,6 +1,5 @@
 package org.whispersystems.textsecuregcm.storage;
 
-import com.google.protobuf.ByteString;
 import org.skife.jdbi.v2.SQLStatement;
 import org.skife.jdbi.v2.StatementContext;
 import org.skife.jdbi.v2.sqlobject.Bind;
@@ -11,8 +10,8 @@ import org.skife.jdbi.v2.sqlobject.SqlQuery;
 import org.skife.jdbi.v2.sqlobject.SqlUpdate;
 import org.skife.jdbi.v2.sqlobject.customizers.Mapper;
 import org.skife.jdbi.v2.tweak.ResultSetMapper;
-import org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal;
-import org.whispersystems.textsecuregcm.util.Pair;
+import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
+import org.whispersystems.textsecuregcm.entities.OutgoingMessageEntity;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
@@ -34,21 +33,27 @@ public abstract class Messages {
   private static final String DESTINATION        = "destination";
   private static final String DESTINATION_DEVICE = "destination_device";
   private static final String MESSAGE            = "message";
+  private static final String CONTENT            = "content";
 
-  @SqlQuery("INSERT INTO messages (" + TYPE + ", " + RELAY + ", " + TIMESTAMP + ", " + SOURCE + ", " + SOURCE_DEVICE + ", " + DESTINATION + ", " + DESTINATION_DEVICE + ", " + MESSAGE + ") " +
-            "VALUES (:type, :relay, :timestamp, :source, :source_device, :destination, :destination_device, :message) " +
-            "RETURNING (SELECT COUNT(id) FROM messages WHERE " + DESTINATION + " = :destination AND " + DESTINATION_DEVICE + " = :destination_device AND " + TYPE + " != " + OutgoingMessageSignal.Type.RECEIPT_VALUE + ")")
-  abstract int store(@MessageBinder OutgoingMessageSignal message,
+  @SqlQuery("INSERT INTO messages (" + TYPE + ", " + RELAY + ", " + TIMESTAMP + ", " + SOURCE + ", " + SOURCE_DEVICE + ", " + DESTINATION + ", " + DESTINATION_DEVICE + ", " + MESSAGE + ", " + CONTENT + ") " +
+            "VALUES (:type, :relay, :timestamp, :source, :source_device, :destination, :destination_device, :message, :content) " +
+            "RETURNING (SELECT COUNT(id) FROM messages WHERE " + DESTINATION + " = :destination AND " + DESTINATION_DEVICE + " = :destination_device AND " + TYPE + " != " + Envelope.Type.RECEIPT_VALUE + ")")
+  abstract int store(@MessageBinder Envelope message,
                      @Bind("destination") String destination,
                      @Bind("destination_device") long destinationDevice);
 
   @Mapper(MessageMapper.class)
   @SqlQuery("SELECT * FROM messages WHERE " + DESTINATION + " = :destination AND " + DESTINATION_DEVICE + " = :destination_device ORDER BY " + TIMESTAMP + " ASC")
-  abstract List<Pair<Long, OutgoingMessageSignal>> load(@Bind("destination") String destination,
-                                                        @Bind("destination_device") long destinationDevice);
+  abstract List<OutgoingMessageEntity> load(@Bind("destination")        String destination,
+                                            @Bind("destination_device") long destinationDevice);
 
-  @SqlUpdate("DELETE FROM messages WHERE " + ID + " = :id")
-  abstract void remove(@Bind("id") long id);
+  @Mapper(MessageMapper.class)
+  @SqlQuery("DELETE FROM messages WHERE " + ID + " IN (SELECT " + ID + " FROM messages WHERE " + DESTINATION + " = :destination AND " + SOURCE + " = :source AND " + TIMESTAMP + " = :timestamp ORDER BY " + ID + " LIMIT 1) RETURNING *")
+  abstract OutgoingMessageEntity remove(@Bind("destination") String destination, @Bind("source") String source, @Bind("timestamp") long timestamp);
+
+  @Mapper(MessageMapper.class)
+  @SqlUpdate("DELETE FROM messages WHERE " + ID + " = :id AND " + DESTINATION + " = :destination")
+  abstract void remove(@Bind("destination") String destination, @Bind("id") long id);
 
   @SqlUpdate("DELETE FROM messages WHERE " + DESTINATION + " = :destination")
   abstract void clear(@Bind("destination") String destination);
@@ -56,20 +61,19 @@ public abstract class Messages {
   @SqlUpdate("VACUUM messages")
   public abstract void vacuum();
 
-  public static class MessageMapper implements ResultSetMapper<Pair<Long, OutgoingMessageSignal>> {
+  public static class MessageMapper implements ResultSetMapper<OutgoingMessageEntity> {
     @Override
-    public Pair<Long, OutgoingMessageSignal> map(int i, ResultSet resultSet, StatementContext statementContext)
+    public OutgoingMessageEntity map(int i, ResultSet resultSet, StatementContext statementContext)
         throws SQLException
     {
-      return new Pair<>(resultSet.getLong(ID),
-                        OutgoingMessageSignal.newBuilder()
-                                             .setType(resultSet.getInt(TYPE))
-                                             .setRelay(resultSet.getString(RELAY))
-                                             .setTimestamp(resultSet.getLong(TIMESTAMP))
-                                             .setSource(resultSet.getString(SOURCE))
-                                             .setSourceDevice(resultSet.getInt(SOURCE_DEVICE))
-                                             .setMessage(ByteString.copyFrom(resultSet.getBytes(MESSAGE)))
-                                             .build());
+      return new OutgoingMessageEntity(resultSet.getLong(ID),
+                                       resultSet.getInt(TYPE),
+                                       resultSet.getString(RELAY),
+                                       resultSet.getLong(TIMESTAMP),
+                                       resultSet.getString(SOURCE),
+                                       resultSet.getInt(SOURCE_DEVICE),
+                                       resultSet.getBytes(MESSAGE),
+                                       resultSet.getBytes(CONTENT));
     }
   }
 
@@ -80,18 +84,19 @@ public abstract class Messages {
     public static class AccountBinderFactory implements BinderFactory {
       @Override
       public Binder build(Annotation annotation) {
-        return new Binder<MessageBinder, OutgoingMessageSignal>() {
+        return new Binder<MessageBinder, Envelope>() {
           @Override
           public void bind(SQLStatement<?> sql,
                            MessageBinder accountBinder,
-                           OutgoingMessageSignal message)
+                           Envelope message)
           {
-            sql.bind(TYPE, message.getType());
+            sql.bind(TYPE, message.getType().getNumber());
             sql.bind(RELAY, message.getRelay());
             sql.bind(TIMESTAMP, message.getTimestamp());
             sql.bind(SOURCE, message.getSource());
             sql.bind(SOURCE_DEVICE, message.getSourceDevice());
-            sql.bind(MESSAGE, message.getMessage().toByteArray());
+            sql.bind(MESSAGE, message.hasLegacyMessage() ? message.getLegacyMessage().toByteArray() : null);
+            sql.bind(CONTENT, message.hasContent() ? message.getContent().toByteArray() : null);
           }
         };
       }

src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java

@@ -1,8 +1,9 @@
 package org.whispersystems.textsecuregcm.storage;
 
 
-import org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal;
-import org.whispersystems.textsecuregcm.util.Pair;
+import com.google.common.base.Optional;
+import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
+import org.whispersystems.textsecuregcm.entities.OutgoingMessageEntity;
 
 import java.util.List;
 
@@ -14,11 +15,11 @@ public class MessagesManager {
     this.messages = messages;
   }
 
-  public int insert(String destination, long destinationDevice, OutgoingMessageSignal message) {
+  public int insert(String destination, long destinationDevice, Envelope message) {
     return this.messages.store(message, destination, destinationDevice) + 1;
   }
 
-  public List<Pair<Long, OutgoingMessageSignal>> getMessagesForDevice(String destination, long destinationDevice) {
+  public List<OutgoingMessageEntity> getMessagesForDevice(String destination, long destinationDevice) {
     return this.messages.load(destination, destinationDevice);
   }
 
@@ -26,7 +27,11 @@ public class MessagesManager {
     this.messages.clear(destination);
   }
 
-  public void delete(long id) {
-    this.messages.remove(id);
+  public Optional<OutgoingMessageEntity> delete(String destination, String source, long timestamp) {
+    return Optional.fromNullable(this.messages.remove(destination, source, timestamp));
+  }
+
+  public void delete(String destination, long id) {
+    this.messages.remove(destination, id);
   }
 }

src/main/java/org/whispersystems/textsecuregcm/storage/PubSubListener.java

@@ -1,9 +0,0 @@
-package org.whispersystems.textsecuregcm.storage;
-
-import static org.whispersystems.textsecuregcm.storage.PubSubProtos.PubSubMessage;
-
-public interface PubSubListener {
-
-  public void onPubSubMessage(PubSubMessage outgoingMessage);
-
-}

src/main/java/org/whispersystems/textsecuregcm/storage/PubSubManager.java

@@ -1,177 +1,114 @@
 package org.whispersystems.textsecuregcm.storage;
 
-import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.ByteString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.textsecuregcm.websocket.DeadLetterHandler;
+import org.whispersystems.dispatch.DispatchChannel;
+import org.whispersystems.dispatch.DispatchManager;
 import org.whispersystems.textsecuregcm.websocket.WebsocketAddress;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
 
+import io.dropwizard.lifecycle.Managed;
 import static org.whispersystems.textsecuregcm.storage.PubSubProtos.PubSubMessage;
-import redis.clients.jedis.BinaryJedisPubSub;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
-public class PubSubManager {
+public class PubSubManager implements Managed {
 
-  private static final byte[] KEEPALIVE_CHANNEL = "KEEPALIVE".getBytes();
+  private static final String KEEPALIVE_CHANNEL = "KEEPALIVE";
 
-  private final Logger                      logger       = LoggerFactory.getLogger(PubSubManager.class);
-  private final SubscriptionListener        baseListener = new SubscriptionListener();
-  private final Map<String, PubSubListener> listeners    = new HashMap<>();
-  private final Executor                    threaded     = Executors.newCachedThreadPool();
+  private final Logger logger = LoggerFactory.getLogger(PubSubManager.class);
 
+  private final DispatchManager dispatchManager;
   private final JedisPool         jedisPool;
-  private final DeadLetterHandler deadLetterHandler;
 
   private boolean subscribed = false;
 
-  public PubSubManager(JedisPool jedisPool, DeadLetterHandler deadLetterHandler) {
+  public PubSubManager(JedisPool jedisPool, DispatchManager dispatchManager) {
+    this.dispatchManager = dispatchManager;
     this.jedisPool         = jedisPool;
-    this.deadLetterHandler = deadLetterHandler;
-    initializePubSubWorker();
-    waitForSubscription();
   }
 
-  public synchronized void subscribe(WebsocketAddress address, PubSubListener listener) {
-    String serializedAddress = address.serialize();
+  @Override
+  public void start() throws Exception {
+    this.dispatchManager.start();
 
-    listeners.put(serializedAddress, listener);
-    baseListener.subscribe(serializedAddress.getBytes());
-  }
+    KeepaliveDispatchChannel keepaliveDispatchChannel = new KeepaliveDispatchChannel();
+    this.dispatchManager.subscribe(KEEPALIVE_CHANNEL, keepaliveDispatchChannel);
 
-  public synchronized void unsubscribe(WebsocketAddress address, PubSubListener listener) {
-    String serializedAddress = address.serialize();
-
-    if (listeners.get(serializedAddress) == listener) {
-      listeners.remove(serializedAddress);
-      baseListener.unsubscribe(serializedAddress.getBytes());
+    synchronized (this) {
+      while (!subscribed) wait(0);
     }
+
+    new KeepaliveSender().start();
   }
 
-  public synchronized boolean publish(WebsocketAddress address, PubSubMessage message) {
+  @Override
+  public void stop() throws Exception {
+    dispatchManager.shutdown();
+  }
+
+  public void subscribe(WebsocketAddress address, DispatchChannel channel) {
+    String serializedAddress = address.serialize();
+    dispatchManager.subscribe(serializedAddress, channel);
+  }
+
+  public void unsubscribe(WebsocketAddress address, DispatchChannel dispatchChannel) {
+    String serializedAddress = address.serialize();
+    dispatchManager.unsubscribe(serializedAddress, dispatchChannel);
+  }
+
+  public boolean hasLocalSubscription(WebsocketAddress address) {
+    return dispatchManager.hasSubscription(address.serialize());
+  }
+
+  public boolean publish(WebsocketAddress address, PubSubMessage message) {
     return publish(address.serialize().getBytes(), message);
   }
 
-  private synchronized boolean publish(byte[] channel, PubSubMessage message) {
+  private boolean publish(byte[] channel, PubSubMessage message) {
     try (Jedis jedis = jedisPool.getResource()) {
       return jedis.publish(channel, message.toByteArray()) != 0;
     }
   }
 
-  private synchronized void resubscribeAll() {
-    for (String serializedAddress : listeners.keySet()) {
-      baseListener.subscribe(serializedAddress.getBytes());
-    }
-  }
-
-  private synchronized void waitForSubscription() {
-    try {
-      while (!subscribed) {
-        wait();
-      }
-    } catch (InterruptedException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  private void initializePubSubWorker() {
-    new Thread("PubSubListener") {
-      @Override
-      public void run() {
-        for (;;) {
-          logger.info("Starting Redis PubSub Subscriber...");
-
-          try (Jedis jedis = jedisPool.getResource()) {
-            jedis.subscribe(baseListener, KEEPALIVE_CHANNEL);
-            logger.warn("**** Unsubscribed from holding channel!!! ******");
-          } catch (Throwable t) {
-            logger.warn("*** SUBSCRIBER CONNECTION CLOSED", t);
-          }
-        }
-      }
-    }.start();
-
-    new Thread("PubSubKeepAlive") {
-      @Override
-      public void run() {
-        for (;;) {
-          try {
-            Thread.sleep(20000);
-            publish(KEEPALIVE_CHANNEL, PubSubMessage.newBuilder()
-                                                    .setType(PubSubMessage.Type.KEEPALIVE)
-                                                    .build());
-          } catch (Throwable e) {
-            logger.warn("KEEPALIVE PUBLISH EXCEPTION: ", e);
-          }
-        }
-      }
-    }.start();
-  }
-
-  private class SubscriptionListener extends BinaryJedisPubSub {
+  private class KeepaliveDispatchChannel implements DispatchChannel {
 
     @Override
-    public void onMessage(final byte[] channel, final byte[] message) {
-      if (Arrays.equals(KEEPALIVE_CHANNEL, channel)) {
-        return;
-      }
-
-      final PubSubListener listener;
-
-      synchronized (PubSubManager.this) {
-        listener = listeners.get(new String(channel));
-      }
-
-      threaded.execute(new Runnable() {
-        @Override
-        public void run() {
-          try {
-            PubSubMessage receivedMessage = PubSubMessage.parseFrom(message);
-
-            if (listener != null) listener.onPubSubMessage(receivedMessage);
-            else                  deadLetterHandler.handle(channel, receivedMessage);
-          } catch (InvalidProtocolBufferException e) {
-            logger.warn("Error parsing PubSub protobuf", e);
-          }
-        }
-      });
+    public void onDispatchMessage(String channel, byte[] message) {
+      // Good
     }
 
     @Override
-    public void onPMessage(byte[] s, byte[] s2, byte[] s3) {
-      logger.warn("Received PMessage!");
-    }
-
-    @Override
-    public void onSubscribe(byte[] channel, int count) {
-      if (Arrays.equals(KEEPALIVE_CHANNEL, channel)) {
+    public void onDispatchSubscribed(String channel) {
+      if (KEEPALIVE_CHANNEL.equals(channel)) {
         synchronized (PubSubManager.this) {
           subscribed = true;
           PubSubManager.this.notifyAll();
         }
-
-        threaded.execute(new Runnable() {
-          @Override
-          public void run() {
-            resubscribeAll();
-          }
-        });
       }
     }
 
     @Override
-    public void onUnsubscribe(byte[] s, int i) {}
+    public void onDispatchUnsubscribed(String channel) {
+      logger.warn("***** KEEPALIVE CHANNEL UNSUBSCRIBED *****");
+    }
+  }
 
+  private class KeepaliveSender extends Thread {
     @Override
-    public void onPUnsubscribe(byte[] s, int i) {}
-
-    @Override
-    public void onPSubscribe(byte[] s, int i) {}
+    public void run() {
+      while (true) {
+        try {
+          Thread.sleep(20000);
+          publish(KEEPALIVE_CHANNEL.getBytes(), PubSubMessage.newBuilder()
+                                                             .setType(PubSubMessage.Type.KEEPALIVE)
+                                                             .build());
+        } catch (Throwable e) {
+          logger.warn("***** KEEPALIVE EXCEPTION ******", e);
+        }
+      }
+    }
   }
 }

src/main/java/org/whispersystems/textsecuregcm/util/SystemMapper.java

@@ -2,6 +2,7 @@ package org.whispersystems.textsecuregcm.util;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class SystemMapper {
@@ -11,6 +12,7 @@ public class SystemMapper {
   static {
     mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE);
     mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
   }
 
   public static ObjectMapper getMapper() {

src/main/java/org/whispersystems/textsecuregcm/util/Util.java

@@ -115,12 +115,20 @@ public class Util {
     return parts;
   }
 
-  public static void sleep(int i) {
+  public static void sleep(long i) {
     try {
       Thread.sleep(i);
     } catch (InterruptedException ie) {}
   }
 
+  public static void wait(Object object) {
+    try {
+      object.wait();
+    } catch (InterruptedException e) {
+      throw new AssertionError(e);
+    }
+  }
+
   public static long todayInMillis() {
     return TimeUnit.DAYS.toMillis(TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis()));
   }

src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java

@@ -1,55 +1,69 @@
 package org.whispersystems.textsecuregcm.websocket;
 
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.SharedMetricRegistries;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.textsecuregcm.push.ApnFallbackManager;
 import org.whispersystems.textsecuregcm.push.PushSender;
+import org.whispersystems.textsecuregcm.push.ReceiptSender;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.Device;
 import org.whispersystems.textsecuregcm.storage.MessagesManager;
 import org.whispersystems.textsecuregcm.storage.PubSubManager;
-import org.whispersystems.textsecuregcm.storage.PubSubProtos;
+import org.whispersystems.textsecuregcm.util.Constants;
 import org.whispersystems.textsecuregcm.util.Util;
 import org.whispersystems.websocket.session.WebSocketSessionContext;
 import org.whispersystems.websocket.setup.WebSocketConnectListener;
 
+import static com.codahale.metrics.MetricRegistry.name;
+
 public class AuthenticatedConnectListener implements WebSocketConnectListener {
 
-  private static final Logger logger = LoggerFactory.getLogger(WebSocketConnection.class);
+  private static final Logger         logger            = LoggerFactory.getLogger(WebSocketConnection.class);
+  private static final MetricRegistry metricRegistry    = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
+  private static final Histogram      durationHistogram = metricRegistry.histogram(name(WebSocketConnection.class, "connected_duration"));
 
-  private final AccountsManager accountsManager;
-  private final PushSender      pushSender;
-  private final MessagesManager messagesManager;
-  private final PubSubManager   pubSubManager;
+  private final ApnFallbackManager apnFallbackManager;
+  private final AccountsManager    accountsManager;
+  private final PushSender         pushSender;
+  private final ReceiptSender      receiptSender;
+  private final MessagesManager    messagesManager;
+  private final PubSubManager      pubSubManager;
 
   public AuthenticatedConnectListener(AccountsManager accountsManager, PushSender pushSender,
-                                      MessagesManager messagesManager, PubSubManager pubSubManager)
+                                      ReceiptSender receiptSender,  MessagesManager messagesManager,
+                                      PubSubManager pubSubManager, ApnFallbackManager apnFallbackManager)
   {
-    this.accountsManager = accountsManager;
-    this.pushSender      = pushSender;
-    this.messagesManager = messagesManager;
-    this.pubSubManager   = pubSubManager;
+    this.accountsManager    = accountsManager;
+    this.pushSender         = pushSender;
+    this.receiptSender      = receiptSender;
+    this.messagesManager    = messagesManager;
+    this.pubSubManager      = pubSubManager;
+    this.apnFallbackManager = apnFallbackManager;
   }
 
   @Override
   public void onWebSocketConnect(WebSocketSessionContext context) {
-    Account account = context.getAuthenticated(Account.class).get();
-    Device  device  = account.getAuthenticatedDevice().get();
+    final Account             account     = context.getAuthenticated(Account.class).get();
+    final Device              device      = account.getAuthenticatedDevice().get();
+    final long                connectTime = System.currentTimeMillis();
+    final WebsocketAddress    address     = new WebsocketAddress(account.getNumber(), device.getId());
+    final WebSocketConnection connection  = new WebSocketConnection(pushSender, receiptSender,
+                                                                    messagesManager, account, device,
+                                                                    context.getClient());
 
+    apnFallbackManager.cancel(address);
     updateLastSeen(account, device);
-    closeExistingDeviceConnection(account, device);
-
-    final WebSocketConnection connection = new WebSocketConnection(accountsManager, pushSender,
-                                                                   messagesManager, pubSubManager,
-                                                                   account, device,
-                                                                   context.getClient());
-
-    connection.onConnected();
+    pubSubManager.subscribe(address, connection);
 
     context.addListener(new WebSocketSessionContext.WebSocketEventListener() {
       @Override
       public void onWebSocketClose(WebSocketSessionContext context, int statusCode, String reason) {
-        connection.onConnectionLost();
+        pubSubManager.unsubscribe(address, connection);
+        durationHistogram.update(System.currentTimeMillis() - connectTime);
       }
     });
   }
@@ -60,12 +74,5 @@ public class AuthenticatedConnectListener implements WebSocketConnectListener {
       accountsManager.update(account);
     }
   }
-
-  private void closeExistingDeviceConnection(Account account, Device device) {
-    pubSubManager.publish(new WebsocketAddress(account.getNumber(), device.getId()),
-                          PubSubProtos.PubSubMessage.newBuilder()
-                                                    .setType(PubSubProtos.PubSubMessage.Type.CLOSE)
-                                                    .build());
-  }
 }
 

src/main/java/org/whispersystems/textsecuregcm/websocket/DeadLetterHandler.java

@@ -3,11 +3,12 @@ package org.whispersystems.textsecuregcm.websocket;
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal;
+import org.whispersystems.dispatch.DispatchChannel;
+import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
 import org.whispersystems.textsecuregcm.storage.MessagesManager;
-import org.whispersystems.textsecuregcm.storage.PubSubProtos;
+import org.whispersystems.textsecuregcm.storage.PubSubProtos.PubSubMessage;
 
-public class DeadLetterHandler {
+public class DeadLetterHandler implements DispatchChannel {
 
   private final Logger logger = LoggerFactory.getLogger(DeadLetterHandler.class);
 
@@ -17,15 +18,17 @@ public class DeadLetterHandler {
     this.messagesManager = messagesManager;
   }
 
-  public void handle(byte[] channel, PubSubProtos.PubSubMessage pubSubMessage) {
+  @Override
+  public void onDispatchMessage(String channel, byte[] data) {
     try {
-      WebsocketAddress address = new WebsocketAddress(new String(channel));
+      logger.warn("Handling dead letter to: " + channel);
 
-      logger.warn("Handling dead letter to: " + address);
+      WebsocketAddress address       = new WebsocketAddress(channel);
+      PubSubMessage    pubSubMessage = PubSubMessage.parseFrom(data);
 
       switch (pubSubMessage.getType().getNumber()) {
-        case PubSubProtos.PubSubMessage.Type.DELIVER_VALUE:
-          OutgoingMessageSignal message = OutgoingMessageSignal.parseFrom(pubSubMessage.getContent());
+        case PubSubMessage.Type.DELIVER_VALUE:
+          Envelope message = Envelope.parseFrom(pubSubMessage.getContent());
           messagesManager.insert(address.getNumber(), address.getDeviceId(), message);
           break;
       }
@@ -36,4 +39,13 @@ public class DeadLetterHandler {
     }
   }
 
+  @Override
+  public void onDispatchSubscribed(String channel) {
+    logger.warn("DeadLetterHandler subscription notice! " + channel);
+  }
+
+  @Override
+  public void onDispatchUnsubscribed(String channel) {
+    logger.warn("DeadLetterHandler unsubscribe notice! " + channel);
+  }
 }

src/main/java/org/whispersystems/textsecuregcm/websocket/ProvisioningAddress.java

@@ -7,15 +7,16 @@ import java.security.SecureRandom;
 
 public class ProvisioningAddress extends WebsocketAddress {
 
-  private final String address;
+  public ProvisioningAddress(String address, int id) throws InvalidWebsocketAddressException {
+    super(address, id);
+  }
 
-  public ProvisioningAddress(String address) throws InvalidWebsocketAddressException {
-    super(address, 0);
-    this.address = address;
+  public ProvisioningAddress(String serialized) throws InvalidWebsocketAddressException {
+    super(serialized);
   }
 
   public String getAddress() {
-    return address;
+    return getNumber();
   }
 
   public static ProvisioningAddress generate() {
@@ -24,7 +25,7 @@ public class ProvisioningAddress extends WebsocketAddress {
       SecureRandom.getInstance("SHA1PRNG").nextBytes(random);
 
       return new ProvisioningAddress(Base64.encodeBytesWithoutPadding(random)
-                                           .replace('+', '-').replace('/', '_'));
+                                           .replace('+', '-').replace('/', '_'), 0);
     } catch (NoSuchAlgorithmException | InvalidWebsocketAddressException e) {
       throw new AssertionError(e);
     }

src/main/java/org/whispersystems/textsecuregcm/websocket/ProvisioningConnectListener.java

@@ -14,13 +14,15 @@ public class ProvisioningConnectListener implements WebSocketConnectListener {
 
   @Override
   public void onWebSocketConnect(WebSocketSessionContext context) {
-    final ProvisioningConnection connection = new ProvisioningConnection(pubSubManager, context.getClient());
-    connection.onConnected();
+    final ProvisioningConnection connection          = new ProvisioningConnection(context.getClient());
+    final ProvisioningAddress    provisioningAddress = ProvisioningAddress.generate();
+
+    pubSubManager.subscribe(provisioningAddress, connection);
 
     context.addListener(new WebSocketSessionContext.WebSocketEventListener() {
       @Override
       public void onWebSocketClose(WebSocketSessionContext context, int statusCode, String reason) {
-        connection.onConnectionLost();
+        pubSubManager.unsubscribe(provisioningAddress, connection);
       }
     });
   }

src/main/java/org/whispersystems/textsecuregcm/websocket/ProvisioningConnection.java

@@ -4,58 +4,68 @@ import com.google.common.base.Optional;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.protobuf.InvalidProtocolBufferException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.dispatch.DispatchChannel;
 import org.whispersystems.textsecuregcm.entities.MessageProtos.ProvisioningUuid;
-import org.whispersystems.textsecuregcm.storage.PubSubListener;
-import org.whispersystems.textsecuregcm.storage.PubSubManager;
 import org.whispersystems.textsecuregcm.storage.PubSubProtos.PubSubMessage;
 import org.whispersystems.websocket.WebSocketClient;
 import org.whispersystems.websocket.messages.WebSocketResponseMessage;
 
-public class ProvisioningConnection implements PubSubListener {
+public class ProvisioningConnection implements DispatchChannel {
 
-  private final PubSubManager       pubSubManager;
-  private final ProvisioningAddress provisioningAddress;
-  private final WebSocketClient     client;
+  private final Logger logger = LoggerFactory.getLogger(ProvisioningConnection.class);
 
-  public ProvisioningConnection(PubSubManager pubSubManager, WebSocketClient client) {
-    this.pubSubManager       = pubSubManager;
-    this.client              = client;
-    this.provisioningAddress = ProvisioningAddress.generate();
+  private final WebSocketClient client;
+
+  public ProvisioningConnection(WebSocketClient client) {
+    this.client = client;
   }
 
   @Override
-  public void onPubSubMessage(PubSubMessage outgoingMessage) {
-    if (outgoingMessage.getType() == PubSubMessage.Type.DELIVER) {
-      Optional<byte[]> body = Optional.of(outgoingMessage.getContent().toByteArray());
+  public void onDispatchMessage(String channel, byte[] message) {
+    try {
+      PubSubMessage outgoingMessage = PubSubMessage.parseFrom(message);
 
-      ListenableFuture<WebSocketResponseMessage> response = client.sendRequest("PUT", "/v1/message", body);
+      if (outgoingMessage.getType() == PubSubMessage.Type.DELIVER) {
+        Optional<byte[]> body = Optional.of(outgoingMessage.getContent().toByteArray());
 
-      Futures.addCallback(response, new FutureCallback<WebSocketResponseMessage>() {
-        @Override
-        public void onSuccess(WebSocketResponseMessage webSocketResponseMessage) {
-          pubSubManager.unsubscribe(provisioningAddress, ProvisioningConnection.this);
-          client.close(1001, "All you get.");
-        }
+        ListenableFuture<WebSocketResponseMessage> response = client.sendRequest("PUT", "/v1/message", body);
 
-        @Override
-        public void onFailure(Throwable throwable) {
-          pubSubManager.unsubscribe(provisioningAddress, ProvisioningConnection.this);
-          client.close(1001, "That's all!");
-        }
-      });
+        Futures.addCallback(response, new FutureCallback<WebSocketResponseMessage>() {
+          @Override
+          public void onSuccess(WebSocketResponseMessage webSocketResponseMessage) {
+            client.close(1001, "All you get.");
+          }
+
+          @Override
+          public void onFailure(Throwable throwable) {
+            client.close(1001, "That's all!");
+          }
+        });
+      }
+    } catch (InvalidProtocolBufferException e) {
+      logger.warn("Protobuf Error: ", e);
     }
   }
 
-  public void onConnected() {
-    this.pubSubManager.subscribe(provisioningAddress, this);
-    this.client.sendRequest("PUT", "/v1/address", Optional.of(ProvisioningUuid.newBuilder()
-                                                                              .setUuid(provisioningAddress.getAddress())
-                                                                              .build()
-                                                                              .toByteArray()));
+  @Override
+  public void onDispatchSubscribed(String channel) {
+    try {
+      ProvisioningAddress address = new ProvisioningAddress(channel);
+      this.client.sendRequest("PUT", "/v1/address", Optional.of(ProvisioningUuid.newBuilder()
+                                                                                .setUuid(address.getAddress())
+                                                                                .build()
+                                                                                .toByteArray()));
+    } catch (InvalidWebsocketAddressException e) {
+      logger.warn("Badly formatted address", e);
+      this.client.close(1001, "Server Error");
+    }
   }
 
-  public void onConnectionLost() {
-    this.pubSubManager.unsubscribe(provisioningAddress, this);
-    this.client.close(1001, "Done");
+  @Override
+  public void onDispatchUnsubscribed(String channel) {
+    this.client.close(1001, "Closed");
   }
 }

src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java

@@ -4,85 +4,72 @@ import com.google.common.base.Optional;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.dispatch.DispatchChannel;
+import org.whispersystems.textsecuregcm.controllers.NoSuchUserException;
 import org.whispersystems.textsecuregcm.entities.CryptoEncodingException;
 import org.whispersystems.textsecuregcm.entities.EncryptedOutgoingMessage;
+import org.whispersystems.textsecuregcm.entities.OutgoingMessageEntity;
 import org.whispersystems.textsecuregcm.push.NotPushRegisteredException;
 import org.whispersystems.textsecuregcm.push.PushSender;
+import org.whispersystems.textsecuregcm.push.ReceiptSender;
 import org.whispersystems.textsecuregcm.push.TransientPushFailureException;
 import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.Device;
 import org.whispersystems.textsecuregcm.storage.MessagesManager;
-import org.whispersystems.textsecuregcm.storage.PubSubListener;
-import org.whispersystems.textsecuregcm.storage.PubSubManager;
-import org.whispersystems.textsecuregcm.util.Pair;
 import org.whispersystems.websocket.WebSocketClient;
 import org.whispersystems.websocket.messages.WebSocketResponseMessage;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import javax.ws.rs.WebApplicationException;
+import java.io.IOException;
 import java.util.List;
 
-import static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal;
+import static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
 import static org.whispersystems.textsecuregcm.storage.PubSubProtos.PubSubMessage;
 
-public class WebSocketConnection implements PubSubListener {
+public class WebSocketConnection implements DispatchChannel {
 
   private static final Logger logger = LoggerFactory.getLogger(WebSocketConnection.class);
 
-  private final AccountsManager  accountsManager;
+  private final ReceiptSender    receiptSender;
   private final PushSender       pushSender;
   private final MessagesManager  messagesManager;
-  private final PubSubManager    pubSubManager;
 
   private final Account          account;
   private final Device           device;
-  private final WebsocketAddress address;
   private final WebSocketClient  client;
 
-  public WebSocketConnection(AccountsManager accountsManager,
-                             PushSender pushSender,
+  public WebSocketConnection(PushSender pushSender,
+                             ReceiptSender receiptSender,
                              MessagesManager messagesManager,
-                             PubSubManager pubSubManager,
                              Account account,
                              Device device,
                              WebSocketClient client)
   {
-    this.accountsManager = accountsManager;
     this.pushSender      = pushSender;
+    this.receiptSender   = receiptSender;
     this.messagesManager = messagesManager;
-    this.pubSubManager   = pubSubManager;
     this.account         = account;
     this.device          = device;
     this.client          = client;
-    this.address         = new WebsocketAddress(account.getNumber(), device.getId());
-  }
-
-  public void onConnected() {
-    pubSubManager.subscribe(address, this);
-    processStoredMessages();
-  }
-
-  public void onConnectionLost() {
-    pubSubManager.unsubscribe(address, this);
   }
 
   @Override
-  public void onPubSubMessage(PubSubMessage pubSubMessage) {
+  public void onDispatchMessage(String channel, byte[] message) {
     try {
+      PubSubMessage pubSubMessage = PubSubMessage.parseFrom(message);
+
       switch (pubSubMessage.getType().getNumber()) {
         case PubSubMessage.Type.QUERY_DB_VALUE:
           processStoredMessages();
           break;
         case PubSubMessage.Type.DELIVER_VALUE:
-          sendMessage(OutgoingMessageSignal.parseFrom(pubSubMessage.getContent()), Optional.<Long>absent());
-          break;
-        case PubSubMessage.Type.CLOSE_VALUE:
-          client.close(1000, "OK");
-          pubSubManager.unsubscribe(address, this);
+          sendMessage(Envelope.parseFrom(pubSubMessage.getContent()), Optional.<Long>absent());
           break;
         default:
           logger.warn("Unknown pubsub message: " + pubSubMessage.getType().getNumber());
@@ -92,7 +79,16 @@ public class WebSocketConnection implements PubSubListener {
     }
   }
 
-  private void sendMessage(final OutgoingMessageSignal message,
+  @Override
+  public void onDispatchUnsubscribed(String channel) {
+    client.close(1000, "OK");
+  }
+
+  public void onDispatchSubscribed(String channel) {
+    processStoredMessages();
+  }
+
+  private void sendMessage(final Envelope message,
                            final Optional<Long> storedMessageId)
   {
     try {
@@ -103,12 +99,12 @@ public class WebSocketConnection implements PubSubListener {
       Futures.addCallback(response, new FutureCallback<WebSocketResponseMessage>() {
         @Override
         public void onSuccess(@Nullable WebSocketResponseMessage response) {
-          boolean isReceipt = message.getType() == OutgoingMessageSignal.Type.RECEIPT_VALUE;
+          boolean isReceipt = message.getType() == Envelope.Type.RECEIPT;
 
           if (isSuccessResponse(response)) {
-            if (storedMessageId.isPresent()) messagesManager.delete(storedMessageId.get());
+            if (storedMessageId.isPresent()) messagesManager.delete(account.getNumber(), storedMessageId.get());
             if (!isReceipt)                  sendDeliveryReceiptFor(message);
-          } else if (!isSuccessResponse(response) & !storedMessageId.isPresent()) {
+          } else if (!isSuccessResponse(response) && !storedMessageId.isPresent()) {
             requeueMessage(message);
           }
         }
@@ -127,7 +123,7 @@ public class WebSocketConnection implements PubSubListener {
     }
   }
 
-  private void requeueMessage(OutgoingMessageSignal message) {
+  private void requeueMessage(Envelope message) {
     try {
       pushSender.sendMessage(account, device, message);
     } catch (NotPushRegisteredException | TransientPushFailureException e) {
@@ -136,36 +132,43 @@ public class WebSocketConnection implements PubSubListener {
     }
   }
 
-  private void sendDeliveryReceiptFor(OutgoingMessageSignal message) {
+  private void sendDeliveryReceiptFor(Envelope message) {
     try {
-      Optional<Account> source = accountsManager.get(message.getSource());
-
-      if (!source.isPresent()) {
-        logger.warn(String.format("Source account disappeared? (%s)", message.getSource()));
-        return;
-      }
-
-      OutgoingMessageSignal.Builder receipt =
-          OutgoingMessageSignal.newBuilder()
-                               .setSource(account.getNumber())
-                               .setSourceDevice((int) device.getId())
-                               .setTimestamp(message.getTimestamp())
-                               .setType(OutgoingMessageSignal.Type.RECEIPT_VALUE);
-
-      for (Device device : source.get().getDevices()) {
-        pushSender.sendMessage(source.get(), device, receipt.build());
-      }
-    } catch (NotPushRegisteredException | TransientPushFailureException e) {
-      logger.warn("sendDeliveryReceiptFor", "Delivery receipet", e);
+      receiptSender.sendReceipt(account, message.getSource(), message.getTimestamp(),
+                                message.hasRelay() ? Optional.of(message.getRelay()) :
+                                                     Optional.<String>absent());
+    } catch (IOException | NoSuchUserException | TransientPushFailureException | NotPushRegisteredException  e) {
+      logger.warn("sendDeliveryReceiptFor", e);
+    } catch (WebApplicationException e) {
+      logger.warn("Bad federated response for receipt: " + e.getResponse().getStatus());
     }
   }
 
   private void processStoredMessages() {
-    List<Pair<Long, OutgoingMessageSignal>> messages = messagesManager.getMessagesForDevice(account.getNumber(),
-                                                                                            device.getId());
+    List<OutgoingMessageEntity> messages = messagesManager.getMessagesForDevice(account.getNumber(), device.getId());
 
-    for (Pair<Long, OutgoingMessageSignal> message : messages) {
-      sendMessage(message.second(), Optional.of(message.first()));
+    for (OutgoingMessageEntity message : messages) {
+      Envelope.Builder builder = Envelope.newBuilder()
+                                         .setType(Envelope.Type.valueOf(message.getType()))
+                                         .setSourceDevice(message.getSourceDevice())
+                                         .setSource(message.getSource())
+                                         .setTimestamp(message.getTimestamp());
+
+      if (message.getMessage() != null) {
+        builder.setLegacyMessage(ByteString.copyFrom(message.getMessage()));
+      }
+
+      if (message.getContent() != null) {
+        builder.setContent(ByteString.copyFrom(message.getContent()));
+      }
+
+      if (message.getRelay() != null && !message.getRelay().isEmpty()) {
+        builder.setRelay(message.getRelay());
+      }
+
+      sendMessage(builder.build(), Optional.of(message.getId()));
     }
   }
+
+
 }

src/main/java/org/whispersystems/textsecuregcm/workers/DirectoryUpdater.java

@@ -73,7 +73,7 @@ public class DirectoryUpdater {
         for (Account account : accounts) {
           if (account.isActive()) {
             byte[]        token         = Util.getContactToken(account.getNumber());
-            ClientContact clientContact = new ClientContact(token, null, account.getSupportsSms());
+            ClientContact clientContact = new ClientContact(token, null);
 
             directory.add(batchOperation, clientContact);
             contactsAdded++;

src/main/resources/messagedb.xml

@@ -57,4 +57,12 @@
         </createIndex>
     </changeSet>
 
+    <changeSet id="2" author="moxie">
+        <addColumn tableName="messages">
+            <column name="content" type="bytea"/>
+        </addColumn>
+
+        <dropNotNullConstraint tableName="messages" columnName="message"/>
+    </changeSet>
+
 </databaseChangeLog>

src/test/java/org/whispersystems/dispatch/DispatchManagerTest.java

@@ -0,0 +1,127 @@
+package org.whispersystems.dispatch;
+
+import com.google.common.base.Optional;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExternalResource;
+import org.mockito.ArgumentCaptor;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.whispersystems.dispatch.io.RedisPubSubConnectionFactory;
+import org.whispersystems.dispatch.redis.PubSubConnection;
+import org.whispersystems.dispatch.redis.PubSubReply;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.*;
+
+public class DispatchManagerTest {
+
+  private PubSubConnection             pubSubConnection;
+  private RedisPubSubConnectionFactory socketFactory;
+  private DispatchManager              dispatchManager;
+  private PubSubReplyInputStream       pubSubReplyInputStream;
+
+  @Rule
+  public ExternalResource resource = new ExternalResource() {
+    @Override
+    protected void before() throws Throwable {
+      pubSubConnection       = mock(PubSubConnection.class  );
+      socketFactory          = mock(RedisPubSubConnectionFactory.class);
+      pubSubReplyInputStream = new PubSubReplyInputStream();
+
+      when(socketFactory.connect()).thenReturn(pubSubConnection);
+      when(pubSubConnection.read()).thenAnswer(new Answer<PubSubReply>() {
+        @Override
+        public PubSubReply answer(InvocationOnMock invocationOnMock) throws Throwable {
+          return pubSubReplyInputStream.read();
+        }
+      });
+
+      dispatchManager = new DispatchManager(socketFactory, Optional.<DispatchChannel>absent());
+      dispatchManager.start();
+    }
+
+    @Override
+    protected void after() {
+
+    }
+  };
+
+  @Test
+  public void testConnect() {
+    verify(socketFactory).connect();
+  }
+
+  @Test
+  public void testSubscribe() throws IOException {
+    DispatchChannel dispatchChannel = mock(DispatchChannel.class);
+    dispatchManager.subscribe("foo", dispatchChannel);
+    pubSubReplyInputStream.write(new PubSubReply(PubSubReply.Type.SUBSCRIBE, "foo", Optional.<byte[]>absent()));
+
+    verify(dispatchChannel, timeout(1000)).onDispatchSubscribed(eq("foo"));
+  }
+
+  @Test
+  public void testSubscribeUnsubscribe() throws IOException {
+    DispatchChannel dispatchChannel = mock(DispatchChannel.class);
+    dispatchManager.subscribe("foo", dispatchChannel);
+    dispatchManager.unsubscribe("foo", dispatchChannel);
+
+    pubSubReplyInputStream.write(new PubSubReply(PubSubReply.Type.SUBSCRIBE, "foo", Optional.<byte[]>absent()));
+    pubSubReplyInputStream.write(new PubSubReply(PubSubReply.Type.UNSUBSCRIBE, "foo", Optional.<byte[]>absent()));
+
+    verify(dispatchChannel, timeout(1000)).onDispatchUnsubscribed(eq("foo"));
+  }
+
+  @Test
+  public void testMessages() throws IOException {
+    DispatchChannel fooChannel = mock(DispatchChannel.class);
+    DispatchChannel barChannel = mock(DispatchChannel.class);
+
+    dispatchManager.subscribe("foo", fooChannel);
+    dispatchManager.subscribe("bar", barChannel);
+
+    pubSubReplyInputStream.write(new PubSubReply(PubSubReply.Type.SUBSCRIBE, "foo", Optional.<byte[]>absent()));
+    pubSubReplyInputStream.write(new PubSubReply(PubSubReply.Type.SUBSCRIBE, "bar", Optional.<byte[]>absent()));
+
+    verify(fooChannel, timeout(1000)).onDispatchSubscribed(eq("foo"));
+    verify(barChannel, timeout(1000)).onDispatchSubscribed(eq("bar"));
+
+    pubSubReplyInputStream.write(new PubSubReply(PubSubReply.Type.MESSAGE, "foo", Optional.of("hello".getBytes())));
+    pubSubReplyInputStream.write(new PubSubReply(PubSubReply.Type.MESSAGE, "bar", Optional.of("there".getBytes())));
+
+    ArgumentCaptor<byte[]> captor = ArgumentCaptor.forClass(byte[].class);
+    verify(fooChannel, timeout(1000)).onDispatchMessage(eq("foo"), captor.capture());
+
+    assertArrayEquals("hello".getBytes(), captor.getValue());
+
+    verify(barChannel, timeout(1000)).onDispatchMessage(eq("bar"), captor.capture());
+
+    assertArrayEquals("there".getBytes(), captor.getValue());
+  }
+
+  private static class PubSubReplyInputStream {
+
+    private final List<PubSubReply> pubSubReplyList = new LinkedList<>();
+
+    public synchronized PubSubReply read() {
+      try {
+        while (pubSubReplyList.isEmpty()) wait();
+        return pubSubReplyList.remove(0);
+      } catch (InterruptedException e) {
+        throw new AssertionError(e);
+      }
+    }
+
+    public synchronized void write(PubSubReply pubSubReply) {
+      pubSubReplyList.add(pubSubReply);
+      notifyAll();
+    }
+  }
+
+}

src/test/java/org/whispersystems/dispatch/redis/PubSubConnectionTest.java

@@ -0,0 +1,263 @@
+package org.whispersystems.dispatch.redis;
+
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.*;
+
+public class PubSubConnectionTest {
+
+  private static final String REPLY = "*3\r\n" +
+      "$9\r\n" +
+      "subscribe\r\n" +
+      "$5\r\n" +
+      "abcde\r\n" +
+      ":1\r\n" +
+      "*3\r\n" +
+      "$9\r\n" +
+      "subscribe\r\n" +
+      "$5\r\n" +
+      "fghij\r\n" +
+      ":2\r\n" +
+      "*3\r\n" +
+      "$9\r\n" +
+      "subscribe\r\n" +
+      "$5\r\n" +
+      "klmno\r\n" +
+      ":2\r\n" +
+      "*3\r\n" +
+      "$7\r\n" +
+      "message\r\n" +
+      "$5\r\n" +
+      "abcde\r\n" +
+      "$10\r\n" +
+      "1234567890\r\n" +
+      "*3\r\n" +
+      "$7\r\n" +
+      "message\r\n" +
+      "$5\r\n" +
+      "klmno\r\n" +
+      "$10\r\n" +
+      "0987654321\r\n";
+
+
+  @Test
+  public void testSubscribe() throws IOException {
+//    ByteChannel      byteChannel = mock(ByteChannel.class);
+    OutputStream outputStream = mock(OutputStream.class);
+    Socket       socket       = mock(Socket.class      );
+    when(socket.getOutputStream()).thenReturn(outputStream);
+    PubSubConnection connection  = new PubSubConnection(socket);
+
+    connection.subscribe("foobar");
+
+    ArgumentCaptor<byte[]> captor = ArgumentCaptor.forClass(byte[].class);
+    verify(outputStream).write(captor.capture());
+
+    assertArrayEquals(captor.getValue(), "SUBSCRIBE foobar\r\n".getBytes());
+  }
+
+  @Test
+  public void testUnsubscribe() throws IOException {
+    OutputStream outputStream = mock(OutputStream.class);
+    Socket       socket       = mock(Socket.class      );
+    when(socket.getOutputStream()).thenReturn(outputStream);
+    PubSubConnection connection  = new PubSubConnection(socket);
+
+    connection.unsubscribe("bazbar");
+
+    ArgumentCaptor<byte[]> captor = ArgumentCaptor.forClass(byte[].class);
+    verify(outputStream).write(captor.capture());
+
+    assertArrayEquals(captor.getValue(), "UNSUBSCRIBE bazbar\r\n".getBytes());
+  }
+
+  @Test
+  public void testTricklyResponse() throws Exception {
+    InputStream  inputStream  = mockInputStreamFor(new TrickleInputStream(REPLY.getBytes()));
+    OutputStream outputStream = mock(OutputStream.class);
+    Socket       socket       = mock(Socket.class      );
+    when(socket.getOutputStream()).thenReturn(outputStream);
+    when(socket.getInputStream()).thenReturn(inputStream);
+
+    PubSubConnection pubSubConnection = new PubSubConnection(socket);
+    readResponses(pubSubConnection);
+  }
+
+  @Test
+  public void testFullResponse() throws Exception {
+    InputStream  inputStream  = mockInputStreamFor(new FullInputStream(REPLY.getBytes()));
+    OutputStream outputStream = mock(OutputStream.class);
+    Socket       socket       = mock(Socket.class      );
+    when(socket.getOutputStream()).thenReturn(outputStream);
+    when(socket.getInputStream()).thenReturn(inputStream);
+
+    PubSubConnection pubSubConnection = new PubSubConnection(socket);
+    readResponses(pubSubConnection);
+  }
+
+  @Test
+  public void testRandomLengthResponse() throws Exception {
+    InputStream  inputStream  = mockInputStreamFor(new RandomInputStream(REPLY.getBytes()));
+    OutputStream outputStream = mock(OutputStream.class);
+    Socket       socket       = mock(Socket.class      );
+    when(socket.getOutputStream()).thenReturn(outputStream);
+    when(socket.getInputStream()).thenReturn(inputStream);
+
+    PubSubConnection pubSubConnection = new PubSubConnection(socket);
+    readResponses(pubSubConnection);
+  }
+
+  private InputStream mockInputStreamFor(final MockInputStream stub) throws IOException {
+    InputStream result = mock(InputStream.class);
+
+    when(result.read()).thenAnswer(new Answer<Integer>() {
+      @Override
+      public Integer answer(InvocationOnMock invocationOnMock) throws Throwable {
+        return stub.read();
+      }
+    });
+
+    when(result.read(any(byte[].class))).thenAnswer(new Answer<Integer>() {
+      @Override
+      public Integer answer(InvocationOnMock invocationOnMock) throws Throwable {
+        byte[] buffer = (byte[])invocationOnMock.getArguments()[0];
+        return stub.read(buffer, 0, buffer.length);
+      }
+    });
+
+    when(result.read(any(byte[].class), anyInt(), anyInt())).thenAnswer(new Answer<Integer>() {
+      @Override
+      public Integer answer(InvocationOnMock invocationOnMock) throws Throwable {
+        byte[] buffer = (byte[]) invocationOnMock.getArguments()[0];
+        int offset = (int) invocationOnMock.getArguments()[1];
+        int length = (int) invocationOnMock.getArguments()[2];
+
+        return stub.read(buffer, offset, length);
+      }
+    });
+
+    return result;
+  }
+
+  private void readResponses(PubSubConnection pubSubConnection) throws Exception {
+    PubSubReply reply = pubSubConnection.read();
+
+    assertEquals(reply.getType(), PubSubReply.Type.SUBSCRIBE);
+    assertEquals(reply.getChannel(), "abcde");
+    assertFalse(reply.getContent().isPresent());
+
+    reply = pubSubConnection.read();
+
+    assertEquals(reply.getType(), PubSubReply.Type.SUBSCRIBE);
+    assertEquals(reply.getChannel(), "fghij");
+    assertFalse(reply.getContent().isPresent());
+
+    reply = pubSubConnection.read();
+
+    assertEquals(reply.getType(), PubSubReply.Type.SUBSCRIBE);
+    assertEquals(reply.getChannel(), "klmno");
+    assertFalse(reply.getContent().isPresent());
+
+    reply = pubSubConnection.read();
+
+    assertEquals(reply.getType(), PubSubReply.Type.MESSAGE);
+    assertEquals(reply.getChannel(), "abcde");
+    assertArrayEquals(reply.getContent().get(), "1234567890".getBytes());
+
+    reply = pubSubConnection.read();
+
+    assertEquals(reply.getType(), PubSubReply.Type.MESSAGE);
+    assertEquals(reply.getChannel(), "klmno");
+    assertArrayEquals(reply.getContent().get(), "0987654321".getBytes());
+  }
+
+  private interface MockInputStream {
+    public int read();
+    public int read(byte[] input, int offset, int length);
+  }
+
+  private static class TrickleInputStream implements MockInputStream {
+
+    private final byte[] data;
+    private int index = 0;
+
+    private TrickleInputStream(byte[] data) {
+      this.data = data;
+    }
+
+    public int read() {
+      return data[index++];
+    }
+
+    public int read(byte[] input, int offset, int length) {
+      input[offset] = data[index++];
+      return 1;
+    }
+
+  }
+
+  private static class FullInputStream implements MockInputStream {
+
+    private final byte[] data;
+    private int index = 0;
+
+    private FullInputStream(byte[] data) {
+      this.data = data;
+    }
+
+    public int read() {
+      return data[index++];
+    }
+
+    public int read(byte[] input, int offset, int length) {
+      int amount = Math.min(data.length - index, length);
+      System.arraycopy(data, index, input, offset, amount);
+      index += length;
+
+      return amount;
+    }
+  }
+
+  private static class RandomInputStream implements MockInputStream {
+    private final byte[] data;
+    private int index = 0;
+
+    private RandomInputStream(byte[] data) {
+      this.data = data;
+    }
+
+    public int read() {
+      return data[index++];
+    }
+
+    public int read(byte[] input, int offset, int length) {
+      try {
+        int maxCopy    = Math.min(data.length - index, length);
+        int randomCopy = SecureRandom.getInstance("SHA1PRNG").nextInt(maxCopy) + 1;
+        int copyAmount  = Math.min(maxCopy, randomCopy);
+
+        System.arraycopy(data, index, input, offset, copyAmount);
+        index += copyAmount;
+
+        return copyAmount;
+      } catch (NoSuchAlgorithmException e) {
+        throw new AssertionError(e);
+      }
+    }
+
+  }
+
+}

src/test/java/org/whispersystems/dispatch/redis/protocol/ArrayReplyHeaderTest.java

@@ -0,0 +1,51 @@
+package org.whispersystems.dispatch.redis.protocol;
+
+
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+
+public class ArrayReplyHeaderTest {
+
+
+  @Test(expected = IOException.class)
+  public void testNull() throws IOException {
+    new ArrayReplyHeader(null);
+  }
+
+  @Test(expected = IOException.class)
+  public void testBadPrefix() throws IOException {
+    new ArrayReplyHeader(":3");
+  }
+
+  @Test(expected = IOException.class)
+  public void testEmpty() throws IOException {
+    new ArrayReplyHeader("");
+  }
+
+  @Test(expected = IOException.class)
+  public void testTruncated() throws IOException {
+    new ArrayReplyHeader("*");
+  }
+
+  @Test(expected = IOException.class)
+  public void testBadNumber() throws IOException {
+    new ArrayReplyHeader("*ABC");
+  }
+
+  @Test
+  public void testValid() throws IOException {
+    assertEquals(4, new ArrayReplyHeader("*4").getElementCount());
+  }
+
+
+
+
+
+
+
+
+
+}

src/test/java/org/whispersystems/dispatch/redis/protocol/IntReplyHeaderTest.java

@@ -0,0 +1,36 @@
+package org.whispersystems.dispatch.redis.protocol;
+
+
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+
+public class IntReplyHeaderTest {
+
+  @Test(expected = IOException.class)
+  public void testNull() throws IOException {
+    new IntReply(null);
+  }
+
+  @Test(expected = IOException.class)
+  public void testEmpty() throws IOException {
+    new IntReply("");
+  }
+
+  @Test(expected = IOException.class)
+  public void testBadNumber() throws IOException {
+    new IntReply(":A");
+  }
+
+  @Test(expected = IOException.class)
+  public void testBadFormat() throws IOException {
+    new IntReply("*");
+  }
+
+  @Test
+  public void testValid() throws IOException {
+    assertEquals(23, new IntReply(":23").getValue());
+  }
+}

src/test/java/org/whispersystems/dispatch/redis/protocol/StringReplyHeaderTest.java

@@ -0,0 +1,47 @@
+package org.whispersystems.dispatch.redis.protocol;
+
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+
+public class StringReplyHeaderTest {
+
+  @Test
+  public void testNull() {
+    try {
+      new StringReplyHeader(null);
+      throw new AssertionError();
+    } catch (IOException e) {
+      // good
+    }
+  }
+
+  @Test
+  public void testBadNumber() {
+    try {
+      new StringReplyHeader("$100A");
+      throw new AssertionError();
+    } catch (IOException e) {
+      // good
+    }
+  }
+
+  @Test
+  public void testBadPrefix() {
+    try {
+      new StringReplyHeader("*");
+      throw new AssertionError();
+    } catch (IOException e) {
+      // good
+    }
+  }
+
+  @Test
+  public void testValid() throws IOException {
+    assertEquals(1000, new StringReplyHeader("$1000").getStringLength());
+  }
+
+
+}

src/test/java/org/whispersystems/textsecuregcm/tests/controllers/AccountControllerTest.java

@@ -22,6 +22,8 @@ import org.whispersystems.textsecuregcm.tests.util.AuthHelper;
 
 import javax.ws.rs.core.MediaType;
 
+import java.util.HashMap;
+
 import io.dropwizard.testing.junit.ResourceTestRule;
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.mockito.Matchers.anyString;
@@ -49,7 +51,8 @@ public class AccountControllerTest {
                                                                                                smsSender,
                                                                                                storedMessages,
                                                                                                timeProvider,
-                                                                                               Optional.of(authorizationKey)))
+                                                                                               Optional.of(authorizationKey),
+                                                                                               new HashMap<String, Integer>()))
                                                             .build();
 
 
@@ -80,7 +83,7 @@ public class AccountControllerTest {
     ClientResponse response =
         resources.client().resource(String.format("/v1/accounts/code/%s", "1234"))
             .header("Authorization", AuthHelper.getAuthHeader(SENDER, "bar"))
-            .entity(new AccountAttributes("keykeykeykey", false, false, 2222))
+            .entity(new AccountAttributes("keykeykeykey", false, 2222))
             .type(MediaType.APPLICATION_JSON_TYPE)
             .put(ClientResponse.class);
 
@@ -94,7 +97,7 @@ public class AccountControllerTest {
     ClientResponse response =
         resources.client().resource(String.format("/v1/accounts/code/%s", "1111"))
             .header("Authorization", AuthHelper.getAuthHeader(SENDER, "bar"))
-            .entity(new AccountAttributes("keykeykeykey", false, false, 3333))
+            .entity(new AccountAttributes("keykeykeykey", false, 3333))
             .type(MediaType.APPLICATION_JSON_TYPE)
             .put(ClientResponse.class);
 
@@ -112,7 +115,7 @@ public class AccountControllerTest {
     ClientResponse response =
         resources.client().resource(String.format("/v1/accounts/token/%s", token))
         .header("Authorization", AuthHelper.getAuthHeader(SENDER, "bar"))
-        .entity(new AccountAttributes("keykeykeykey", false, false, 4444))
+        .entity(new AccountAttributes("keykeykeykey", false, 4444))
         .type(MediaType.APPLICATION_JSON_TYPE)
         .put(ClientResponse.class);
 
@@ -130,7 +133,7 @@ public class AccountControllerTest {
     ClientResponse response =
         resources.client().resource(String.format("/v1/accounts/token/%s", token))
                  .header("Authorization", AuthHelper.getAuthHeader(SENDER, "bar"))
-                 .entity(new AccountAttributes("keykeykeykey", false, false, 4444))
+                 .entity(new AccountAttributes("keykeykeykey", false, 4444))
                  .type(MediaType.APPLICATION_JSON_TYPE)
                  .put(ClientResponse.class);
 
@@ -148,7 +151,7 @@ public class AccountControllerTest {
     ClientResponse response =
         resources.client().resource(String.format("/v1/accounts/token/%s", token))
                  .header("Authorization", AuthHelper.getAuthHeader("+14151111111", "bar"))
-                 .entity(new AccountAttributes("keykeykeykey", false, false, 4444))
+                 .entity(new AccountAttributes("keykeykeykey", false, 4444))
                  .type(MediaType.APPLICATION_JSON_TYPE)
                  .put(ClientResponse.class);
 
@@ -166,7 +169,7 @@ public class AccountControllerTest {
     ClientResponse response =
         resources.client().resource(String.format("/v1/accounts/token/%s", token))
                  .header("Authorization", AuthHelper.getAuthHeader(SENDER, "bar"))
-                 .entity(new AccountAttributes("keykeykeykey", false, false, 4444))
+                 .entity(new AccountAttributes("keykeykeykey", false, 4444))
                  .type(MediaType.APPLICATION_JSON_TYPE)
                  .put(ClientResponse.class);
 

src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java

@@ -17,6 +17,7 @@
 package org.whispersystems.textsecuregcm.tests.controllers;
 
 import com.google.common.base.Optional;
+import com.sun.jersey.api.client.ClientResponse;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -25,6 +26,7 @@ import org.whispersystems.textsecuregcm.entities.AccountAttributes;
 import org.whispersystems.textsecuregcm.entities.DeviceResponse;
 import org.whispersystems.textsecuregcm.limits.RateLimiter;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
+import org.whispersystems.textsecuregcm.mappers.DeviceLimitExceededExceptionMapper;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.PendingDevicesManager;
@@ -34,8 +36,10 @@ import org.whispersystems.textsecuregcm.util.VerificationCode;
 import javax.ws.rs.Path;
 import javax.ws.rs.core.MediaType;
 
+import io.dropwizard.jersey.validation.ConstraintViolationExceptionMapper;
 import io.dropwizard.testing.junit.ResourceTestRule;
 import static org.fest.assertions.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.*;
 
 public class DeviceControllerTest {
@@ -56,10 +60,13 @@ public class DeviceControllerTest {
   private RateLimiters          rateLimiters          = mock(RateLimiters.class          );
   private RateLimiter           rateLimiter           = mock(RateLimiter.class           );
   private Account               account               = mock(Account.class               );
+  private Account               maxedAccount          = mock(Account.class);
 
   @Rule
   public final ResourceTestRule resources = ResourceTestRule.builder()
                                                             .addProvider(AuthHelper.getAuthenticator())
+                                                            .addProvider(new DeviceLimitExceededExceptionMapper())
+                                                            .addProvider(new ConstraintViolationExceptionMapper())
                                                             .addResource(new DumbVerificationDeviceController(pendingDevicesManager,
                                                                                                               accountsManager,
                                                                                                               rateLimiters))
@@ -75,9 +82,12 @@ public class DeviceControllerTest {
     when(rateLimiters.getVerifyDeviceLimiter()).thenReturn(rateLimiter);
 
     when(account.getNextDeviceId()).thenReturn(42L);
+    when(maxedAccount.getActiveDeviceCount()).thenReturn(3);
 
     when(pendingDevicesManager.getCodeForNumber(AuthHelper.VALID_NUMBER)).thenReturn(Optional.of("5678901"));
+    when(pendingDevicesManager.getCodeForNumber(AuthHelper.VALID_NUMBER_TWO)).thenReturn(Optional.of("1112223"));
     when(accountsManager.get(AuthHelper.VALID_NUMBER)).thenReturn(Optional.of(account));
+    when(accountsManager.get(AuthHelper.VALID_NUMBER_TWO)).thenReturn(Optional.of(maxedAccount));
   }
 
   @Test
@@ -90,7 +100,7 @@ public class DeviceControllerTest {
 
     DeviceResponse response = resources.client().resource("/v1/devices/5678901")
         .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_NUMBER, "password1"))
-        .entity(new AccountAttributes("keykeykeykey", false, true, 1234))
+        .entity(new AccountAttributes("keykeykeykey", false, 1234))
         .type(MediaType.APPLICATION_JSON_TYPE)
         .put(DeviceResponse.class);
 
@@ -98,4 +108,24 @@ public class DeviceControllerTest {
 
     verify(pendingDevicesManager).remove(AuthHelper.VALID_NUMBER);
   }
+
+  @Test
+  public void maxDevicesTest() throws Exception {
+    ClientResponse response = resources.client().resource("/v1/devices/provisioning/code")
+                                       .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_NUMBER_TWO, AuthHelper.VALID_PASSWORD_TWO))
+                                       .get(ClientResponse.class);
+
+    assertEquals(response.getStatus(), 411);
+  }
+
+  @Test
+  public void longNameTest() throws Exception {
+    ClientResponse response = resources.client().resource("/v1/devices/5678901")
+                                       .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_NUMBER, "password1"))
+                                       .entity(new AccountAttributes("keykeykeykey", false, 1234, "this is a really long name that is longer than 80 characters"))
+                                       .type(MediaType.APPLICATION_JSON_TYPE)
+                                       .put(ClientResponse.class);
+
+    assertEquals(response.getStatus(), 422);
+  }
 }

src/test/java/org/whispersystems/textsecuregcm/tests/controllers/FederatedControllerTest.java

@@ -4,7 +4,6 @@ package org.whispersystems.textsecuregcm.tests.controllers;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Optional;
 import com.sun.jersey.api.client.ClientResponse;
-import org.hamcrest.CoreMatchers;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -21,15 +20,16 @@ import org.whispersystems.textsecuregcm.federation.FederatedClientManager;
 import org.whispersystems.textsecuregcm.limits.RateLimiter;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.push.PushSender;
+import org.whispersystems.textsecuregcm.push.ReceiptSender;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.Device;
+import org.whispersystems.textsecuregcm.storage.MessagesManager;
 import org.whispersystems.textsecuregcm.tests.util.AuthHelper;
 
 import javax.ws.rs.core.MediaType;
 import java.util.HashSet;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.Set;
 
 import io.dropwizard.testing.junit.ResourceTestRule;
@@ -47,8 +47,10 @@ public class FederatedControllerTest {
   private static final String MULTI_DEVICE_RECIPIENT  = "+14152222222";
 
   private PushSender             pushSender             = mock(PushSender.class            );
+  private ReceiptSender          receiptSender          = mock(ReceiptSender.class);
   private FederatedClientManager federatedClientManager = mock(FederatedClientManager.class);
   private AccountsManager        accountsManager        = mock(AccountsManager.class       );
+  private MessagesManager        messagesManager        = mock(MessagesManager.class);
   private RateLimiters           rateLimiters           = mock(RateLimiters.class          );
   private RateLimiter            rateLimiter            = mock(RateLimiter.class           );
 
@@ -57,7 +59,7 @@ public class FederatedControllerTest {
 
   private final ObjectMapper mapper = new ObjectMapper();
 
-  private final MessageController messageController = new MessageController(rateLimiters, pushSender, accountsManager, federatedClientManager);
+  private final MessageController messageController = new MessageController(rateLimiters, pushSender, receiptSender, accountsManager, messagesManager, federatedClientManager);
   private final KeysControllerV2  keysControllerV2  = mock(KeysControllerV2.class);
 
   @Rule
@@ -72,16 +74,16 @@ public class FederatedControllerTest {
   @Before
   public void setup() throws Exception {
     Set<Device> singleDeviceList = new HashSet<Device>() {{
-      add(new Device(1, "foo", "bar", "baz", "isgcm", null, false, 111, null, System.currentTimeMillis()));
+      add(new Device(1, null, "foo", "bar", "baz", "isgcm", null, null, false, 111, null, System.currentTimeMillis(), System.currentTimeMillis()));
     }};
 
     Set<Device> multiDeviceList = new HashSet<Device>() {{
-      add(new Device(1, "foo", "bar", "baz", "isgcm", null, false, 222, null, System.currentTimeMillis()));
-      add(new Device(2, "foo", "bar", "baz", "isgcm", null, false, 333, null, System.currentTimeMillis()));
+      add(new Device(1, null, "foo", "bar", "baz", "isgcm", null, null, false, 222, null, System.currentTimeMillis(), System.currentTimeMillis()));
+      add(new Device(2, null, "foo", "bar", "baz", "isgcm", null, null, false, 333, null, System.currentTimeMillis(), System.currentTimeMillis()));
     }};
 
-    Account singleDeviceAccount = new Account(SINGLE_DEVICE_RECIPIENT, false, singleDeviceList);
-    Account multiDeviceAccount  = new Account(MULTI_DEVICE_RECIPIENT, false, multiDeviceList);
+    Account singleDeviceAccount = new Account(SINGLE_DEVICE_RECIPIENT, singleDeviceList);
+    Account multiDeviceAccount  = new Account(MULTI_DEVICE_RECIPIENT, multiDeviceList);
 
     when(accountsManager.get(eq(SINGLE_DEVICE_RECIPIENT))).thenReturn(Optional.of(singleDeviceAccount));
     when(accountsManager.get(eq(MULTI_DEVICE_RECIPIENT))).thenReturn(Optional.of(multiDeviceAccount));
@@ -104,7 +106,7 @@ public class FederatedControllerTest {
 
     assertThat("Good Response", response.getStatus(), is(equalTo(204)));
 
-    verify(pushSender).sendMessage(any(Account.class), any(Device.class), any(MessageProtos.OutgoingMessageSignal.class));
+    verify(pushSender).sendMessage(any(Account.class), any(Device.class), any(MessageProtos.Envelope.class));
   }
 
   @Test

src/test/java/org/whispersystems/textsecuregcm/tests/controllers/MessageControllerTest.java

@@ -6,25 +6,29 @@ import com.sun.jersey.api.client.ClientResponse;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.controllers.MessageController;
 import org.whispersystems.textsecuregcm.entities.IncomingMessageList;
-import org.whispersystems.textsecuregcm.entities.MessageProtos;
+import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
 import org.whispersystems.textsecuregcm.entities.MismatchedDevices;
+import org.whispersystems.textsecuregcm.entities.OutgoingMessageEntity;
+import org.whispersystems.textsecuregcm.entities.OutgoingMessageEntityList;
 import org.whispersystems.textsecuregcm.entities.SignedPreKey;
 import org.whispersystems.textsecuregcm.entities.StaleDevices;
 import org.whispersystems.textsecuregcm.federation.FederatedClientManager;
 import org.whispersystems.textsecuregcm.limits.RateLimiter;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.push.PushSender;
+import org.whispersystems.textsecuregcm.push.ReceiptSender;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.Device;
+import org.whispersystems.textsecuregcm.storage.MessagesManager;
 import org.whispersystems.textsecuregcm.tests.util.AuthHelper;
 
 import javax.ws.rs.core.MediaType;
 import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -32,6 +36,7 @@ import io.dropwizard.testing.junit.ResourceTestRule;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
@@ -44,8 +49,10 @@ public class MessageControllerTest {
   private static final String MULTI_DEVICE_RECIPIENT  = "+14152222222";
 
   private  final PushSender             pushSender             = mock(PushSender.class            );
+  private  final ReceiptSender          receiptSender          = mock(ReceiptSender.class);
   private  final FederatedClientManager federatedClientManager = mock(FederatedClientManager.class);
   private  final AccountsManager        accountsManager        = mock(AccountsManager.class       );
+  private  final MessagesManager        messagesManager        = mock(MessagesManager.class);
   private  final RateLimiters           rateLimiters           = mock(RateLimiters.class          );
   private  final RateLimiter            rateLimiter            = mock(RateLimiter.class           );
 
@@ -54,25 +61,25 @@ public class MessageControllerTest {
   @Rule
   public final ResourceTestRule resources = ResourceTestRule.builder()
                                                             .addProvider(AuthHelper.getAuthenticator())
-                                                            .addResource(new MessageController(rateLimiters, pushSender, accountsManager,
-                                                                                               federatedClientManager))
+                                                            .addResource(new MessageController(rateLimiters, pushSender, receiptSender, accountsManager,
+                                                                                               messagesManager, federatedClientManager))
                                                             .build();
 
 
   @Before
   public void setup() throws Exception {
     Set<Device> singleDeviceList = new HashSet<Device>() {{
-      add(new Device(1, "foo", "bar", "baz", "isgcm", null, false, 111, null, System.currentTimeMillis()));
+      add(new Device(1, null, "foo", "bar", "baz", "isgcm", null, null, false, 111, null, System.currentTimeMillis(), System.currentTimeMillis()));
     }};
 
     Set<Device> multiDeviceList = new HashSet<Device>() {{
-      add(new Device(1, "foo", "bar", "baz", "isgcm", null, false, 222, new SignedPreKey(111, "foo", "bar"), System.currentTimeMillis()));
-      add(new Device(2, "foo", "bar", "baz", "isgcm", null, false, 333, new SignedPreKey(222, "oof", "rab"), System.currentTimeMillis()));
-      add(new Device(3, "foo", "bar", "baz", "isgcm", null, false, 444, null, System.currentTimeMillis() - TimeUnit.DAYS.toMillis(31)));
+      add(new Device(1, null, "foo", "bar", "baz", "isgcm", null, null, false, 222, new SignedPreKey(111, "foo", "bar"), System.currentTimeMillis(), System.currentTimeMillis()));
+      add(new Device(2, null, "foo", "bar", "baz", "isgcm", null, null, false, 333, new SignedPreKey(222, "oof", "rab"), System.currentTimeMillis(), System.currentTimeMillis()));
+      add(new Device(3, null, "foo", "bar", "baz", "isgcm", null, null, false, 444, null, System.currentTimeMillis() - TimeUnit.DAYS.toMillis(31), System.currentTimeMillis()));
     }};
 
-    Account singleDeviceAccount = new Account(SINGLE_DEVICE_RECIPIENT, false, singleDeviceList);
-    Account multiDeviceAccount  = new Account(MULTI_DEVICE_RECIPIENT, false, multiDeviceList);
+    Account singleDeviceAccount = new Account(SINGLE_DEVICE_RECIPIENT, singleDeviceList);
+    Account multiDeviceAccount  = new Account(MULTI_DEVICE_RECIPIENT, multiDeviceList);
 
     when(accountsManager.get(eq(SINGLE_DEVICE_RECIPIENT))).thenReturn(Optional.of(singleDeviceAccount));
     when(accountsManager.get(eq(MULTI_DEVICE_RECIPIENT))).thenReturn(Optional.of(multiDeviceAccount));
@@ -91,7 +98,7 @@ public class MessageControllerTest {
 
     assertThat("Good Response", response.getStatus(), is(equalTo(200)));
 
-    verify(pushSender, times(1)).sendMessage(any(Account.class), any(Device.class), any(MessageProtos.OutgoingMessageSignal.class));
+    verify(pushSender, times(1)).sendMessage(any(Account.class), any(Device.class), any(Envelope.class));
   }
 
   @Test
@@ -105,7 +112,7 @@ public class MessageControllerTest {
 
     assertThat("Good Response", response.getStatus(), is(equalTo(200)));
 
-    verify(pushSender, times(1)).sendMessage(any(Account.class), any(Device.class), any(MessageProtos.OutgoingMessageSignal.class));
+    verify(pushSender, times(1)).sendMessage(any(Account.class), any(Device.class), any(Envelope.class));
   }
 
   @Test
@@ -155,7 +162,7 @@ public class MessageControllerTest {
 
     assertThat("Good Response Code", response.getStatus(), is(equalTo(200)));
 
-    verify(pushSender, times(2)).sendMessage(any(Account.class), any(Device.class), any(MessageProtos.OutgoingMessageSignal.class));
+    verify(pushSender, times(2)).sendMessage(any(Account.class), any(Device.class), any(Envelope.class));
   }
 
   @Test
@@ -177,4 +184,75 @@ public class MessageControllerTest {
 
   }
 
+  @Test
+  public synchronized void testGetMessages() throws Exception {
+
+    final long timestampOne = 313377;
+    final long timestampTwo = 313388;
+
+    List<OutgoingMessageEntity> messages = new LinkedList<OutgoingMessageEntity>() {{
+      add(new OutgoingMessageEntity(1L, Envelope.Type.CIPHERTEXT_VALUE, null, timestampOne, "+14152222222", 2, "hi there".getBytes(), null));
+      add(new OutgoingMessageEntity(2L, Envelope.Type.RECEIPT_VALUE, null, timestampTwo, "+14152222222", 2, null, null));
+    }};
+
+    when(messagesManager.getMessagesForDevice(eq(AuthHelper.VALID_NUMBER), eq(1L))).thenReturn(messages);
+
+    OutgoingMessageEntityList response =
+        resources.client().resource("/v1/messages/")
+                 .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_NUMBER, AuthHelper.VALID_PASSWORD))
+                 .accept(MediaType.APPLICATION_JSON_TYPE)
+                 .get(OutgoingMessageEntityList.class);
+
+
+    assertEquals(response.getMessages().size(), 2);
+
+    assertEquals(response.getMessages().get(0).getId(), 0);
+    assertEquals(response.getMessages().get(1).getId(), 0);
+
+    assertEquals(response.getMessages().get(0).getTimestamp(), timestampOne);
+    assertEquals(response.getMessages().get(1).getTimestamp(), timestampTwo);
+  }
+
+  @Test
+  public synchronized void testDeleteMessages() throws Exception {
+    long timestamp = System.currentTimeMillis();
+    when(messagesManager.delete(AuthHelper.VALID_NUMBER, "+14152222222", 31337))
+        .thenReturn(Optional.of(new OutgoingMessageEntity(31337L,
+                                                          Envelope.Type.CIPHERTEXT_VALUE,
+                                                          null, timestamp,
+                                                          "+14152222222", 1, "hi".getBytes(), null)));
+
+    when(messagesManager.delete(AuthHelper.VALID_NUMBER, "+14152222222", 31338))
+        .thenReturn(Optional.of(new OutgoingMessageEntity(31337L,
+                                                          Envelope.Type.RECEIPT_VALUE,
+                                                          null, System.currentTimeMillis(),
+                                                          "+14152222222", 1, null, null)));
+
+
+    when(messagesManager.delete(AuthHelper.VALID_NUMBER, "+14152222222", 31339))
+        .thenReturn(Optional.<OutgoingMessageEntity>absent());
+
+    ClientResponse response = resources.client().resource(String.format("/v1/messages/%s/%d", "+14152222222", 31337))
+                                       .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_NUMBER, AuthHelper.VALID_PASSWORD))
+                                       .delete(ClientResponse.class);
+
+    assertThat("Good Response Code", response.getStatus(), is(equalTo(204)));
+    verify(receiptSender).sendReceipt(any(Account.class), eq("+14152222222"), eq(timestamp), eq(Optional.<String>absent()));
+
+    response = resources.client().resource(String.format("/v1/messages/%s/%d", "+14152222222", 31338))
+                        .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_NUMBER, AuthHelper.VALID_PASSWORD))
+                        .delete(ClientResponse.class);
+
+    assertThat("Good Response Code", response.getStatus(), is(equalTo(204)));
+    verifyNoMoreInteractions(receiptSender);
+
+    response = resources.client().resource(String.format("/v1/messages/%s/%d", "+14152222222", 31339))
+                        .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_NUMBER, AuthHelper.VALID_PASSWORD))
+                        .delete(ClientResponse.class);
+
+    assertThat("Good Response Code", response.getStatus(), is(equalTo(204)));
+    verifyNoMoreInteractions(receiptSender);
+
+  }
+
 }

src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ReceiptControllerTest.java

@@ -6,28 +6,22 @@ import com.sun.jersey.api.client.ClientResponse;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.whispersystems.textsecuregcm.controllers.MessageController;
 import org.whispersystems.textsecuregcm.controllers.ReceiptController;
 import org.whispersystems.textsecuregcm.entities.MessageProtos;
+import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
 import org.whispersystems.textsecuregcm.federation.FederatedClientManager;
-import org.whispersystems.textsecuregcm.limits.RateLimiter;
-import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.push.PushSender;
+import org.whispersystems.textsecuregcm.push.ReceiptSender;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.Device;
 import org.whispersystems.textsecuregcm.tests.util.AuthHelper;
 
 import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 import io.dropwizard.testing.junit.ResourceTestRule;
 import static org.fest.assertions.api.Assertions.assertThat;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.core.IsEqual.equalTo;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
@@ -40,27 +34,29 @@ public class ReceiptControllerTest  {
   private  final FederatedClientManager federatedClientManager = mock(FederatedClientManager.class);
   private  final AccountsManager        accountsManager        = mock(AccountsManager.class       );
 
+  private final ReceiptSender receiptSender = new ReceiptSender(accountsManager, pushSender, federatedClientManager);
+
   private  final ObjectMapper mapper = new ObjectMapper();
 
   @Rule
   public final ResourceTestRule resources = ResourceTestRule.builder()
                                                             .addProvider(AuthHelper.getAuthenticator())
-                                                            .addResource(new ReceiptController(accountsManager, federatedClientManager, pushSender))
+                                                            .addResource(new ReceiptController(receiptSender))
                                                             .build();
 
   @Before
   public void setup() throws Exception {
     Set<Device> singleDeviceList = new HashSet<Device>() {{
-      add(new Device(1, "foo", "bar", "baz", "isgcm", null, false, 111, null, System.currentTimeMillis()));
+      add(new Device(1, null, "foo", "bar", "baz", "isgcm", null, null, false, 111, null, System.currentTimeMillis(), System.currentTimeMillis()));
     }};
 
     Set<Device> multiDeviceList = new HashSet<Device>() {{
-      add(new Device(1, "foo", "bar", "baz", "isgcm", null, false, 222, null, System.currentTimeMillis()));
-      add(new Device(2, "foo", "bar", "baz", "isgcm", null, false, 333, null, System.currentTimeMillis()));
+      add(new Device(1, null, "foo", "bar", "baz", "isgcm", null, null, false, 222, null, System.currentTimeMillis(), System.currentTimeMillis()));
+      add(new Device(2, null, "foo", "bar", "baz", "isgcm", null, null, false, 333, null, System.currentTimeMillis(), System.currentTimeMillis()));
     }};
 
-    Account singleDeviceAccount = new Account(SINGLE_DEVICE_RECIPIENT, false, singleDeviceList);
-    Account multiDeviceAccount  = new Account(MULTI_DEVICE_RECIPIENT, false, multiDeviceList);
+    Account singleDeviceAccount = new Account(SINGLE_DEVICE_RECIPIENT, singleDeviceList);
+    Account multiDeviceAccount  = new Account(MULTI_DEVICE_RECIPIENT, multiDeviceList);
 
     when(accountsManager.get(eq(SINGLE_DEVICE_RECIPIENT))).thenReturn(Optional.of(singleDeviceAccount));
     when(accountsManager.get(eq(MULTI_DEVICE_RECIPIENT))).thenReturn(Optional.of(multiDeviceAccount));
@@ -75,7 +71,7 @@ public class ReceiptControllerTest  {
 
     assertThat(response.getStatus() == 204);
 
-    verify(pushSender, times(1)).sendMessage(any(Account.class), any(Device.class), any(MessageProtos.OutgoingMessageSignal.class));
+    verify(pushSender, times(1)).sendMessage(any(Account.class), any(Device.class), any(Envelope.class));
   }
 
   @Test
@@ -87,7 +83,7 @@ public class ReceiptControllerTest  {
 
     assertThat(response.getStatus() == 204);
 
-    verify(pushSender, times(2)).sendMessage(any(Account.class), any(Device.class), any(MessageProtos.OutgoingMessageSignal.class));
+    verify(pushSender, times(2)).sendMessage(any(Account.class), any(Device.class), any(Envelope.class));
   }
 
 

src/test/java/org/whispersystems/textsecuregcm/tests/entities/ClientContactTest.java

@@ -17,9 +17,9 @@ public class ClientContactTest {
   @Test
   public void serializeToJSON() throws Exception {
     byte[]        token               = Util.getContactToken("+14152222222");
-    ClientContact contact             = new ClientContact(token, null, false);
-    ClientContact contactWithRelay    = new ClientContact(token, "whisper", false);
-    ClientContact contactWithRelaySms = new ClientContact(token, "whisper", true );
+    ClientContact contact             = new ClientContact(token, null);
+    ClientContact contactWithRelay    = new ClientContact(token, "whisper");
+    ClientContact contactWithRelaySms = new ClientContact(token, "whisper");
 
     assertThat("Basic Contact Serialization works",
                asJson(contact),
@@ -28,19 +28,15 @@ public class ClientContactTest {
     assertThat("Contact Relay Serialization works",
                asJson(contactWithRelay),
                is(equalTo(jsonFixture("fixtures/contact.relay.json"))));
-
-    assertThat("Contact Relay+SMS Serialization works",
-               asJson(contactWithRelaySms),
-               is(equalTo(jsonFixture("fixtures/contact.relay.sms.json"))));
   }
 
   @Test
   public void deserializeFromJSON() throws Exception {
     ClientContact contact = new ClientContact(Util.getContactToken("+14152222222"),
-                                              "whisper", true);
+                                              "whisper");
 
     assertThat("a ClientContact can be deserialized from JSON",
-               fromJson(jsonFixture("fixtures/contact.relay.sms.json"), ClientContact.class),
+               fromJson(jsonFixture("fixtures/contact.relay.json"), ClientContact.class),
                is(contact));
   }
 

src/test/java/org/whispersystems/textsecuregcm/tests/entities/PreKeyTest.java

@@ -26,10 +26,10 @@ public class PreKeyTest {
   @Test
   public void deserializeFromJSONV() throws Exception {
     ClientContact contact = new ClientContact(Util.getContactToken("+14152222222"),
-                                              "whisper", true);
+                                              "whisper");
 
     assertThat("a ClientContact can be deserialized from JSON",
-               fromJson(jsonFixture("fixtures/contact.relay.sms.json"), ClientContact.class),
+               fromJson(jsonFixture("fixtures/contact.relay.json"), ClientContact.class),
                is(contact));
   }
 

src/test/java/org/whispersystems/textsecuregcm/tests/push/ApnFallbackManagerTest.java

@@ -0,0 +1,59 @@
+package org.whispersystems.textsecuregcm.tests.push;
+
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.whispersystems.textsecuregcm.entities.ApnMessage;
+import org.whispersystems.textsecuregcm.push.ApnFallbackManager;
+import org.whispersystems.textsecuregcm.push.ApnFallbackManager.ApnFallbackTask;
+import org.whispersystems.textsecuregcm.push.PushServiceClient;
+import org.whispersystems.textsecuregcm.util.Util;
+import org.whispersystems.textsecuregcm.websocket.WebsocketAddress;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.mockito.Mockito.*;
+
+public class ApnFallbackManagerTest {
+
+  @Test
+  public void testFullFallback() throws Exception {
+    PushServiceClient  pushServiceClient  = mock(PushServiceClient.class);
+    WebsocketAddress   address            = mock(WebsocketAddress.class );
+    ApnMessage         message            = new ApnMessage("bar", "123", 1, "hmm", true, 1111);
+    ApnFallbackTask    task               = new ApnFallbackTask("foo", message, 500);
+
+    ApnFallbackManager apnFallbackManager = new ApnFallbackManager(pushServiceClient);
+    apnFallbackManager.start();
+
+    apnFallbackManager.schedule(address, task);
+
+    Util.sleep(1100);
+
+    ArgumentCaptor<ApnMessage> captor = ArgumentCaptor.forClass(ApnMessage.class);
+    verify(pushServiceClient, times(1)).send(captor.capture());
+
+    assertEquals(captor.getValue().getMessage(), message.getMessage());
+    assertEquals(captor.getValue().getApnId(), task.getApnId());
+    assertFalse(captor.getValue().isVoip());
+    assertEquals(captor.getValue().getExpirationTime(), Integer.MAX_VALUE * 1000L);
+  }
+
+  @Test
+  public void testNoFallback() throws Exception {
+    PushServiceClient  pushServiceClient  = mock(PushServiceClient.class);
+    WebsocketAddress   address            = mock(WebsocketAddress.class );
+    ApnMessage         message            = new ApnMessage("bar", "123", 1, "hmm", true, 5555);
+    ApnFallbackTask    task               = new ApnFallbackTask   ("foo", message, 500);
+
+    ApnFallbackManager apnFallbackManager = new ApnFallbackManager(pushServiceClient);
+    apnFallbackManager.start();
+
+    apnFallbackManager.schedule(address, task);
+    apnFallbackManager.cancel(address);
+
+    Util.sleep(1100);
+
+    verifyNoMoreInteractions(pushServiceClient);
+  }
+
+}

src/test/java/org/whispersystems/textsecuregcm/tests/push/ApnFallbackTaskQueueTest.java

@@ -0,0 +1,93 @@
+package org.whispersystems.textsecuregcm.tests.push;
+
+
+import org.junit.Test;
+import org.whispersystems.textsecuregcm.push.ApnFallbackManager;
+import org.whispersystems.textsecuregcm.push.ApnFallbackManager.ApnFallbackTask;
+import org.whispersystems.textsecuregcm.push.ApnFallbackManager.ApnFallbackTaskQueue;
+import org.whispersystems.textsecuregcm.util.Util;
+import org.whispersystems.textsecuregcm.websocket.WebsocketAddress;
+
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class ApnFallbackTaskQueueTest {
+
+  @Test
+  public void testBlocking() {
+    final ApnFallbackTaskQueue taskQueue = new ApnFallbackTaskQueue();
+
+    final WebsocketAddress address = mock(WebsocketAddress.class);
+    final ApnFallbackTask  task    = mock(ApnFallbackTask.class );
+
+    when(task.getExecutionTime()).thenReturn(System.currentTimeMillis() - 1000);
+
+    new Thread() {
+      @Override
+      public void run() {
+        Util.sleep(500);
+        taskQueue.put(address, task);
+      }
+    }.start();
+
+    Map.Entry<WebsocketAddress, ApnFallbackTask> result = taskQueue.get();
+
+    assertEquals(result.getKey(), address);
+    assertEquals(result.getValue(), task);
+  }
+
+  @Test
+  public void testElapsedTime() {
+    final ApnFallbackTaskQueue taskQueue = new ApnFallbackTaskQueue();
+    final WebsocketAddress     address   = mock(WebsocketAddress.class);
+    final ApnFallbackTask      task      = mock(ApnFallbackTask.class );
+
+    long currentTime = System.currentTimeMillis();
+
+    when(task.getExecutionTime()).thenReturn(currentTime + 1000);
+
+    taskQueue.put(address, task);
+    Map.Entry<WebsocketAddress, ApnFallbackTask> result = taskQueue.get();
+
+    assertTrue(System.currentTimeMillis() >= currentTime + 1000);
+    assertEquals(result.getKey(), address);
+    assertEquals(result.getValue(), task);
+  }
+
+  @Test
+  public void testCanceled() {
+    final ApnFallbackTaskQueue taskQueue = new ApnFallbackTaskQueue();
+    final WebsocketAddress     addressOne   = mock(WebsocketAddress.class);
+    final ApnFallbackTask      taskOne      = mock(ApnFallbackTask.class );
+    final WebsocketAddress     addressTwo   = mock(WebsocketAddress.class);
+    final ApnFallbackTask      taskTwo      = mock(ApnFallbackTask.class );
+
+    long currentTime = System.currentTimeMillis();
+
+    when(taskOne.getExecutionTime()).thenReturn(currentTime + 1000);
+    when(taskTwo.getExecutionTime()).thenReturn(currentTime + 2000);
+
+    taskQueue.put(addressOne, taskOne);
+    taskQueue.put(addressTwo, taskTwo);
+
+    new Thread() {
+      @Override
+      public void run() {
+        Util.sleep(300);
+        taskQueue.remove(addressOne);
+      }
+    }.start();
+
+    Map.Entry<WebsocketAddress, ApnFallbackTask> result = taskQueue.get();
+
+    assertTrue(System.currentTimeMillis() >= currentTime + 2000);
+    assertEquals(result.getKey(), addressTwo);
+    assertEquals(result.getValue(), taskTwo);
+  }
+
+
+}

src/test/java/org/whispersystems/textsecuregcm/tests/util/AuthHelper.java

@@ -17,6 +17,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -24,23 +25,38 @@ public class AuthHelper {
   public static final String VALID_NUMBER   = "+14150000000";
   public static final String VALID_PASSWORD = "foo";
 
+  public static final String VALID_NUMBER_TWO = "+14151111111";
+  public static final String VALID_PASSWORD_TWO = "baz";
+
   public static final String INVVALID_NUMBER  = "+14151111111";
   public static final String INVALID_PASSWORD = "bar";
 
   public static AccountsManager           ACCOUNTS_MANAGER  = mock(AccountsManager.class          );
   public static Account                   VALID_ACCOUNT     = mock(Account.class                  );
+  public static Account                   VALID_ACCOUNT_TWO = mock(Account.class);
   public static Device                    VALID_DEVICE      = mock(Device.class                   );
-  public static AuthenticationCredentials VALID_CREDENTIALS = mock(AuthenticationCredentials.class);
+  public static Device                    VALID_DEVICE_TWO  = mock(Device.class);
+  private static AuthenticationCredentials VALID_CREDENTIALS = mock(AuthenticationCredentials.class);
+  private static AuthenticationCredentials VALID_CREDENTIALS_TWO = mock(AuthenticationCredentials.class);
 
   public static MultiBasicAuthProvider<FederatedPeer, Account> getAuthenticator() {
     when(VALID_CREDENTIALS.verify("foo")).thenReturn(true);
+    when(VALID_CREDENTIALS_TWO.verify("baz")).thenReturn(true);
     when(VALID_DEVICE.getAuthenticationCredentials()).thenReturn(VALID_CREDENTIALS);
+    when(VALID_DEVICE_TWO.getAuthenticationCredentials()).thenReturn(VALID_CREDENTIALS_TWO);
     when(VALID_DEVICE.getId()).thenReturn(1L);
+    when(VALID_DEVICE_TWO.getId()).thenReturn(1L);
     when(VALID_ACCOUNT.getDevice(anyLong())).thenReturn(Optional.of(VALID_DEVICE));
+    when(VALID_ACCOUNT_TWO.getDevice(eq(1L))).thenReturn(Optional.of(VALID_DEVICE_TWO));
+    when(VALID_ACCOUNT_TWO.getActiveDeviceCount()).thenReturn(3);
     when(VALID_ACCOUNT.getNumber()).thenReturn(VALID_NUMBER);
+    when(VALID_ACCOUNT_TWO.getNumber()).thenReturn(VALID_NUMBER_TWO);
     when(VALID_ACCOUNT.getAuthenticatedDevice()).thenReturn(Optional.of(VALID_DEVICE));
+    when(VALID_ACCOUNT_TWO.getAuthenticatedDevice()).thenReturn(Optional.of(VALID_DEVICE_TWO));
     when(VALID_ACCOUNT.getRelay()).thenReturn(Optional.<String>absent());
+    when(VALID_ACCOUNT_TWO.getRelay()).thenReturn(Optional.<String>absent());
     when(ACCOUNTS_MANAGER.get(VALID_NUMBER)).thenReturn(Optional.of(VALID_ACCOUNT));
+    when(ACCOUNTS_MANAGER.get(VALID_NUMBER_TWO)).thenReturn(Optional.of(VALID_ACCOUNT_TWO));
 
     List<FederatedPeer> peer = new LinkedList<FederatedPeer>() {{
       add(new FederatedPeer("cyanogen", "https://foo", "foofoo", "bazzzzz"));

src/test/java/org/whispersystems/textsecuregcm/tests/websocket/WebSocketConnectionTest.java

@@ -5,11 +5,13 @@ import com.google.common.util.concurrent.SettableFuture;
 import com.google.protobuf.ByteString;
 import org.eclipse.jetty.websocket.api.UpgradeRequest;
 import org.junit.Test;
-import org.mockito.ArgumentCaptor;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.whispersystems.textsecuregcm.auth.AccountAuthenticator;
+import org.whispersystems.textsecuregcm.entities.OutgoingMessageEntity;
+import org.whispersystems.textsecuregcm.push.ApnFallbackManager;
 import org.whispersystems.textsecuregcm.push.PushSender;
+import org.whispersystems.textsecuregcm.push.ReceiptSender;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.Device;
@@ -17,7 +19,6 @@ import org.whispersystems.textsecuregcm.storage.MessagesManager;
 import org.whispersystems.textsecuregcm.storage.PubSubManager;
 import org.whispersystems.textsecuregcm.storage.PubSubProtos;
 import org.whispersystems.textsecuregcm.util.Base64;
-import org.whispersystems.textsecuregcm.util.Pair;
 import org.whispersystems.textsecuregcm.websocket.AuthenticatedConnectListener;
 import org.whispersystems.textsecuregcm.websocket.WebSocketAccountAuthenticator;
 import org.whispersystems.textsecuregcm.websocket.WebSocketConnection;
@@ -25,7 +26,6 @@ import org.whispersystems.textsecuregcm.websocket.WebsocketAddress;
 import org.whispersystems.websocket.WebSocketClient;
 import org.whispersystems.websocket.messages.WebSocketResponseMessage;
 import org.whispersystems.websocket.session.WebSocketSessionContext;
-import org.whispersystems.websocket.setup.WebSocketConnectListener;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -35,59 +35,34 @@ import java.util.List;
 import java.util.Set;
 
 import io.dropwizard.auth.basic.BasicCredentials;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
-import static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal;
+import static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
 
 public class WebSocketConnectionTest {
 
-//  private static final ObjectMapper mapper = new ObjectMapper();
-
   private static final String VALID_USER   = "+14152222222";
   private static final String INVALID_USER = "+14151111111";
 
   private static final String VALID_PASSWORD   = "secure";
   private static final String INVALID_PASSWORD = "insecure";
 
-//  private static final StoredMessages       storedMessages       = mock(StoredMessages.class);
   private static final AccountAuthenticator accountAuthenticator = mock(AccountAuthenticator.class);
   private static final AccountsManager      accountsManager      = mock(AccountsManager.class);
   private static final PubSubManager        pubSubManager        = mock(PubSubManager.class       );
   private static final Account              account              = mock(Account.class             );
   private static final Device               device               = mock(Device.class              );
   private static final UpgradeRequest       upgradeRequest       = mock(UpgradeRequest.class      );
-//  private static final Session              session              = mock(Session.class             );
   private static final PushSender           pushSender           = mock(PushSender.class);
-
-  @Test
-  public void testCloseExisting() throws Exception {
-    MessagesManager          storedMessages  = mock(MessagesManager.class        );
-    WebSocketConnectListener connectListener = new AuthenticatedConnectListener(accountsManager, pushSender, storedMessages, pubSubManager);
-    WebSocketSessionContext  sessionContext  = mock(WebSocketSessionContext.class);
-    Account                  account         = mock(Account.class                );
-    Device                   device          = mock(Device.class                 );
-
-    when(sessionContext.getAuthenticated(Account.class)).thenReturn(Optional.of(account));
-    when(account.getAuthenticatedDevice()).thenReturn(Optional.of(device));
-    when(account.getNumber()).thenReturn("+14157777777");
-    when(device.getId()).thenReturn(1L);
-
-    connectListener.onWebSocketConnect(sessionContext);
-
-    ArgumentCaptor<PubSubProtos.PubSubMessage> message = ArgumentCaptor.forClass(PubSubProtos.PubSubMessage.class);
-
-    verify(pubSubManager).publish(eq(new WebsocketAddress("+14157777777", 1L)), message.capture());
-    assertEquals(message.getValue().getType().getNumber(), PubSubProtos.PubSubMessage.Type.CLOSE_VALUE);
-  }
+  private static final ReceiptSender        receiptSender        = mock(ReceiptSender.class);
+  private static final ApnFallbackManager   apnFallbackManager   = mock(ApnFallbackManager.class);
 
   @Test
   public void testCredentials() throws Exception {
     MessagesManager               storedMessages         = mock(MessagesManager.class);
     WebSocketAccountAuthenticator webSocketAuthenticator = new WebSocketAccountAuthenticator(accountAuthenticator);
-    AuthenticatedConnectListener  connectListener        = new AuthenticatedConnectListener(accountsManager, pushSender, storedMessages, pubSubManager);
+    AuthenticatedConnectListener  connectListener        = new AuthenticatedConnectListener(accountsManager, pushSender, receiptSender, storedMessages, pubSubManager, apnFallbackManager);
     WebSocketSessionContext       sessionContext         = mock(WebSocketSessionContext.class);
 
     when(accountAuthenticator.authenticate(eq(new BasicCredentials(VALID_USER, VALID_PASSWORD))))
@@ -98,10 +73,6 @@ public class WebSocketConnectionTest {
 
     when(account.getAuthenticatedDevice()).thenReturn(Optional.of(device));
 
-//    when(session.getUpgradeRequest()).thenReturn(upgradeRequest);
-//
-//    WebsocketController controller = new WebsocketController(accountAuthenticator, accountsManager, pushSender, pubSubManager, storedMessages);
-
     when(upgradeRequest.getParameterMap()).thenReturn(new HashMap<String, String[]>() {{
       put("login", new String[] {VALID_USER});
       put("password", new String[] {VALID_PASSWORD});
@@ -114,13 +85,6 @@ public class WebSocketConnectionTest {
 
     verify(sessionContext).addListener(any(WebSocketSessionContext.WebSocketEventListener.class));
 
-//
-//    controller.onWebSocketConnect(session);
-
-//    verify(session, never()).close();
-//    verify(session, never()).close(any(CloseStatus.class));
-//    verify(session, never()).close(anyInt(), anyString());
-
     when(upgradeRequest.getParameterMap()).thenReturn(new HashMap<String, String[]>() {{
       put("login", new String[] {INVALID_USER});
       put("password", new String[] {INVALID_PASSWORD});
@@ -128,25 +92,16 @@ public class WebSocketConnectionTest {
 
     account = webSocketAuthenticator.authenticate(upgradeRequest);
     assertFalse(account.isPresent());
-//    when(sessionContext.getAuthenticated(Account.class)).thenReturn(account);
-//
-//    WebSocketClient client = mock(WebSocketClient.class);
-//    when(sessionContext.getClient()).thenReturn(client);
-//
-//    connectListener.onWebSocketConnect(sessionContext);
-//
-//    verify(sessionContext, times(1)).addListener(any(WebSocketSessionContext.WebSocketEventListener.class));
-//    verify(client).close(eq(4001), anyString());
   }
 
   @Test
   public void testOpen() throws Exception {
     MessagesManager storedMessages = mock(MessagesManager.class);
 
-    List<Pair<Long, OutgoingMessageSignal>> outgoingMessages = new LinkedList<Pair<Long, OutgoingMessageSignal>> () {{
-      add(new Pair<>(1L, createMessage("sender1", 1111, false, "first")));
-      add(new Pair<>(2L, createMessage("sender1", 2222, false, "second")));
-      add(new Pair<>(3L, createMessage("sender2", 3333, false, "third")));
+    List<OutgoingMessageEntity> outgoingMessages = new LinkedList<OutgoingMessageEntity> () {{
+      add(createMessage(1L, "sender1", 1111, false, "first"));
+      add(createMessage(2L, "sender1", 2222, false, "second"));
+      add(createMessage(3L, "sender2", 3333, false, "third"));
     }};
 
     when(device.getId()).thenReturn(2L);
@@ -183,12 +138,11 @@ public class WebSocketConnectionTest {
           }
         });
 
-    WebSocketConnection connection = new WebSocketConnection(accountsManager, pushSender, storedMessages,
-                                                             pubSubManager, account, device, client);
+    WebsocketAddress websocketAddress = new WebsocketAddress(account.getNumber(), device.getId());
+    WebSocketConnection connection = new WebSocketConnection(pushSender, receiptSender, storedMessages,
+                                                             account, device, client);
 
-    connection.onConnected();
-
-    verify(pubSubManager).subscribe(eq(new WebsocketAddress("+14152222222", 2L)), eq((connection)));
+    connection.onDispatchSubscribed(websocketAddress.serialize());
     verify(client, times(3)).sendRequest(eq("PUT"), eq("/api/v1/message"), any(Optional.class));
 
     assertTrue(futures.size() == 3);
@@ -200,26 +154,102 @@ public class WebSocketConnectionTest {
     futures.get(0).setException(new IOException());
     futures.get(2).setException(new IOException());
 
-    List<OutgoingMessageSignal> pending = new LinkedList<OutgoingMessageSignal>() {{
-      add(createMessage("sender1", 1111, false, "first"));
-      add(createMessage("sender2", 3333, false, "third"));
-    }};
+    verify(storedMessages, times(1)).delete(eq(account.getNumber()), eq(2L));
+    verify(receiptSender, times(1)).sendReceipt(eq(account), eq("sender1"), eq(2222L), eq(Optional.<String>absent()));
 
-//    verify(pushSender, times(2)).sendMessage(eq(account), eq(device), any(OutgoingMessageSignal.class));
-    verify(pushSender, times(1)).sendMessage(eq(sender1), eq(sender1device), any(OutgoingMessageSignal.class));
-
-    connection.onConnectionLost();
-    verify(pubSubManager).unsubscribe(eq(new WebsocketAddress("+14152222222", 2L)), eq(connection));
+    connection.onDispatchUnsubscribed(websocketAddress.serialize());
+    verify(client).close(anyInt(), anyString());
   }
 
-  private OutgoingMessageSignal createMessage(String sender, long timestamp, boolean receipt, String content) {
-    return OutgoingMessageSignal.newBuilder()
-                                .setSource(sender)
-                                .setSourceDevice(1)
-                                .setType(receipt ? OutgoingMessageSignal.Type.RECEIPT_VALUE : OutgoingMessageSignal.Type.CIPHERTEXT_VALUE)
-                                .setTimestamp(timestamp)
-                                .setMessage(ByteString.copyFrom(content.getBytes()))
-                                .build();
+  @Test
+  public void testOnlineSend() throws Exception {
+    MessagesManager storedMessages = mock(MessagesManager.class);
+    Envelope firstMessage = Envelope.newBuilder()
+                                    .setLegacyMessage(ByteString.copyFrom("first".getBytes()))
+                                    .setSource("sender1")
+                                    .setTimestamp(System.currentTimeMillis())
+                                    .setSourceDevice(1)
+                                    .setType(Envelope.Type.CIPHERTEXT)
+                                    .build();
+
+    Envelope secondMessage = Envelope.newBuilder()
+                                     .setLegacyMessage(ByteString.copyFrom("second".getBytes()))
+                                     .setSource("sender2")
+                                     .setTimestamp(System.currentTimeMillis())
+                                     .setSourceDevice(2)
+                                     .setType(Envelope.Type.CIPHERTEXT)
+                                     .build();
+
+    List<OutgoingMessageEntity> pendingMessages = new LinkedList<>();
+
+    when(device.getId()).thenReturn(2L);
+    when(device.getSignalingKey()).thenReturn(Base64.encodeBytes(new byte[52]));
+
+    when(account.getAuthenticatedDevice()).thenReturn(Optional.of(device));
+    when(account.getNumber()).thenReturn("+14152222222");
+
+    final Device sender1device = mock(Device.class);
+
+    Set<Device> sender1devices = new HashSet<Device>() {{
+      add(sender1device);
+    }};
+
+    Account sender1 = mock(Account.class);
+    when(sender1.getDevices()).thenReturn(sender1devices);
+
+    when(accountsManager.get("sender1")).thenReturn(Optional.of(sender1));
+    when(accountsManager.get("sender2")).thenReturn(Optional.<Account>absent());
+
+    when(storedMessages.getMessagesForDevice(account.getNumber(), device.getId()))
+        .thenReturn(pendingMessages);
+
+    final List<SettableFuture<WebSocketResponseMessage>> futures = new LinkedList<>();
+    final WebSocketClient                                client  = mock(WebSocketClient.class);
+
+    when(client.sendRequest(eq("PUT"), eq("/api/v1/message"), any(Optional.class)))
+        .thenAnswer(new Answer<SettableFuture<WebSocketResponseMessage>>() {
+          @Override
+          public SettableFuture<WebSocketResponseMessage> answer(InvocationOnMock invocationOnMock) throws Throwable {
+            SettableFuture<WebSocketResponseMessage> future = SettableFuture.create();
+            futures.add(future);
+            return future;
+          }
+        });
+
+    WebsocketAddress websocketAddress = new WebsocketAddress(account.getNumber(), device.getId());
+    WebSocketConnection connection = new WebSocketConnection(pushSender, receiptSender, storedMessages,
+                                                             account, device, client);
+
+    connection.onDispatchSubscribed(websocketAddress.serialize());
+    connection.onDispatchMessage(websocketAddress.serialize(), PubSubProtos.PubSubMessage.newBuilder()
+                                                                                         .setType(PubSubProtos.PubSubMessage.Type.DELIVER)
+                                                                                         .setContent(ByteString.copyFrom(firstMessage.toByteArray()))
+                                                                                         .build().toByteArray());
+
+    connection.onDispatchMessage(websocketAddress.serialize(), PubSubProtos.PubSubMessage.newBuilder()
+                                                                                         .setType(PubSubProtos.PubSubMessage.Type.DELIVER)
+                                                                                         .setContent(ByteString.copyFrom(secondMessage.toByteArray()))
+                                                                                         .build().toByteArray());
+
+    verify(client, times(2)).sendRequest(eq("PUT"), eq("/api/v1/message"), any(Optional.class));
+
+    assertEquals(futures.size(), 2);
+
+    WebSocketResponseMessage response = mock(WebSocketResponseMessage.class);
+    when(response.getStatus()).thenReturn(200);
+    futures.get(1).set(response);
+    futures.get(0).setException(new IOException());
+
+    verify(receiptSender, times(1)).sendReceipt(eq(account), eq("sender2"), eq(secondMessage.getTimestamp()), eq(Optional.<String>absent()));
+    verify(pushSender, times(1)).sendMessage(eq(account), eq(device), any(Envelope.class));
+
+    connection.onDispatchUnsubscribed(websocketAddress.serialize());
+    verify(client).close(anyInt(), anyString());
+  }
+
+  private OutgoingMessageEntity createMessage(long id, String sender, long timestamp, boolean receipt, String content) {
+    return new OutgoingMessageEntity(id, receipt ? Envelope.Type.RECEIPT_VALUE : Envelope.Type.CIPHERTEXT_VALUE,
+                                     null, timestamp, sender, 1, content.getBytes(), null);
   }
 
 }

src/test/resources/fixtures/contact.relay.sms.json

@@ -1,5 +0,0 @@
-{
-    "relay" : "whisper",
-    "supportsSms"   : true,
-    "token" : "BQVVHxMt5zAFXA"
-}