Make WebSocket optional, disabled by default. Add tests.

This commit is contained in:
Moxie Marlinspike
2014-02-12 14:39:45 -08:00
parent a9994ef5aa
commit a6463df5bb
13 changed files with 250 additions and 4 deletions

View File

@@ -1,6 +1,7 @@
package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting;
import java.util.List;
@@ -12,6 +13,9 @@ public class MismatchedDevices {
@JsonProperty
public List<Long> extraDevices;
@VisibleForTesting
public MismatchedDevices() {}
public MismatchedDevices(List<Long> missingDevices, List<Long> extraDevices) {
this.missingDevices = missingDevices;
this.extraDevices = extraDevices;