New API to support multiple accounts per # (FREEBIE)

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

@@ -28,11 +28,15 @@ public class AccountAttributes {
   @JsonProperty
   private boolean supportsSms;
 
+  @JsonProperty
+  private boolean fetchesMessages;
+
   public AccountAttributes() {}
 
-  public AccountAttributes(String signalingKey, boolean supportsSms) {
+  public AccountAttributes(String signalingKey, boolean supportsSms, boolean fetchesMessages) {
     this.signalingKey = signalingKey;
     this.supportsSms  = supportsSms;
+    this.fetchesMessages = fetchesMessages;
   }
 
   public String getSignalingKey() {
@@ -43,4 +47,8 @@ public class AccountAttributes {
     return supportsSms;
   }
 
+  public boolean getFetchesMessages() {
+    return fetchesMessages;
+  }
+
 }

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

@@ -38,6 +38,9 @@ public class IncomingMessage {
   @JsonProperty
   private long   timestamp;
 
+  @JsonProperty
+  private long   destinationDeviceId = 1;
+
   public String getDestination() {
     return destination;
   }
@@ -53,4 +56,12 @@ public class IncomingMessage {
   public String getRelay() {
     return relay;
   }
+
+  public long getDestinationDeviceId() {
+    return destinationDeviceId;
+  }
+
+  public void setDestinationDeviceId(long destinationDeviceId) {
+    this.destinationDeviceId = destinationDeviceId;
+  }
 }

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

@@ -34,6 +34,10 @@ public class PreKey {
   @JsonIgnore
   private String  number;
 
+  @JsonProperty
+  @NotNull
+  private long deviceId;
+
   @JsonProperty
   @NotNull
   private long    keyId;
@@ -51,12 +55,13 @@ public class PreKey {
 
   public PreKey() {}
 
-  public PreKey(long id, String number, long keyId,
+  public PreKey(long id, String number, long deviceId, long keyId,
                 String publicKey, String identityKey,
                 boolean lastResort)
   {
     this.id          = id;
     this.number      = number;
+    this.deviceId    = deviceId;
     this.keyId       = keyId;
     this.publicKey   = publicKey;
     this.identityKey = identityKey;
@@ -113,4 +118,12 @@ public class PreKey {
   public void setLastResort(boolean lastResort) {
     this.lastResort = lastResort;
   }
+
+  public void setDeviceId(long deviceId) {
+    this.deviceId = deviceId;
+  }
+
+  public long getDeviceId() {
+    return deviceId;
+  }
 }

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

@@ -32,6 +32,10 @@ public class RelayMessage {
   @NotEmpty
   private String destination;
 
+  @JsonProperty
+  @NotEmpty
+  private long destinationDeviceId;
+
   @JsonProperty
   @NotNull
   @JsonSerialize(using = ByteArrayAdapter.Serializing.class)
@@ -40,7 +44,7 @@ public class RelayMessage {
 
   public RelayMessage() {}
 
-  public RelayMessage(String destination, byte[] outgoingMessageSignal) {
+  public RelayMessage(String destination, long destinationDeviceId, byte[] outgoingMessageSignal) {
     this.destination           = destination;
     this.outgoingMessageSignal = outgoingMessageSignal;
   }
@@ -49,6 +53,10 @@ public class RelayMessage {
     return destination;
   }
 
+  public long getDestinationDeviceId() {
+    return destinationDeviceId;
+  }
+
   public byte[] getOutgoingMessageSignal() {
     return outgoingMessageSignal;
   }

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

@@ -0,0 +1,53 @@
+/**
+ * Copyright (C) 2013 Open WhisperSystems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.whispersystems.textsecuregcm.entities;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.annotations.VisibleForTesting;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.Iterator;
+import java.util.List;
+
+public class UnstructuredPreKeyList {
+  @JsonProperty
+  @NotNull
+  @Valid
+  private List<PreKey> keys;
+
+  public UnstructuredPreKeyList(List<PreKey> preKeys) {
+    this.keys = preKeys;
+  }
+
+  public List<PreKey> getKeys() {
+    return keys;
+  }
+
+  @VisibleForTesting public boolean equals(Object o) {
+    if (!(o instanceof UnstructuredPreKeyList) ||
+        ((UnstructuredPreKeyList) o).keys.size() != keys.size())
+      return false;
+    Iterator<PreKey> otherKeys = ((UnstructuredPreKeyList) o).keys.iterator();
+    for (PreKey key : keys) {
+      if (!otherKeys.next().equals(key))
+        return false;
+    }
+    return true;
+  }
+}