MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix IncomingMessage requirements.

This commit is contained in:
Moxie Marlinspike 2014-02-03 11:51:22 -08:00
parent 6e0ae70f02
commit a9994ef5aa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
View File

@ -235,7 +235,9 @@ public class MessageController {
String destination = null; String destination = null;
for (IncomingMessage message : messages) { for (IncomingMessage message : messages) {
if (destination != null && !destination.equals(message.getDestination())) { if ((message.getDestination() == null) ||
(destination != null && !destination.equals(message.getDestination())))
{
throw new ValidationException("Multiple account destinations!"); throw new ValidationException("Multiple account destinations!");
} }

1
src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessage.java
View File

@ -25,7 +25,6 @@ public class IncomingMessage {
private int type; private int type;
@JsonProperty @JsonProperty
@NotEmpty
private String destination; private String destination;
@JsonProperty @JsonProperty