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

Specify media type on attributes put 

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-09-30 17:53:09 -07:00
parent 8d11595290
commit c9e0339a30
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
View File

@ -272,6 +272,7 @@ public class AccountController {
@Timed @Timed
@PUT @PUT
@Path("/attributes/") @Path("/attributes/")
@Consumes(MediaType.APPLICATION_JSON)
public void setAccountAttributes(@Auth Account account, public void setAccountAttributes(@Auth Account account,
@HeaderParam("X-Signal-Agent") String userAgent, @HeaderParam("X-Signal-Agent") String userAgent,
@Valid AccountAttributes attributes) @Valid AccountAttributes attributes)

4
src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java
View File

@ -65,8 +65,8 @@ public class PushSender {
private void sendGcmMessage(Account account, Device device, Envelope message) private void sendGcmMessage(Account account, Device device, Envelope message)
throws TransientPushFailureException, NotPushRegisteredException throws TransientPushFailureException, NotPushRegisteredException
{ {
if (device.getFetchesMessages()) sendNotificationGcmMessage(account, device, message); sendNotificationGcmMessage(account, device, message);
else sendPayloadGcmMessage(account, device, message); // else sendPayloadGcmMessage(account, device, message);
} }
private void sendPayloadGcmMessage(Account account, Device device, Envelope message) private void sendPayloadGcmMessage(Account account, Device device, Envelope message)