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

@@ -19,6 +19,7 @@ package org.whispersystems.textsecuregcm.storage;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Optional;
import java.io.Serializable;
@@ -51,6 +52,13 @@ public class Account implements Serializable {
this.supportsSms = supportsSms;
}
@VisibleForTesting
public Account(String number, boolean supportsSms, List<Device> devices) {
this.number = number;
this.supportsSms = supportsSms;
this.devices = devices;
}
public long getId() {
return id;
}