From c9e0339a3094d70ed3a1e7a667929ee3d376222a Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 30 Sep 2015 17:53:09 -0700
Subject: [PATCH] Specify media type on attributes put

// FREEBIE
---
 .../textsecuregcm/controllers/AccountController.java          | 1 +
 .../org/whispersystems/textsecuregcm/push/PushSender.java     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
index 6e3e215bf..a76cd09ff 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
@@ -272,6 +272,7 @@ public class AccountController {
   @Timed
   @PUT
   @Path("/attributes/")
+  @Consumes(MediaType.APPLICATION_JSON)
   public void setAccountAttributes(@Auth Account account,
                                    @HeaderParam("X-Signal-Agent") String userAgent,
                                    @Valid AccountAttributes attributes)
diff --git a/src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java b/src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java
index 96cc8be07..571b6591c 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java
@@ -65,8 +65,8 @@ public class PushSender {
   private void sendGcmMessage(Account account, Device device, Envelope message)
       throws TransientPushFailureException, NotPushRegisteredException
   {
-    if (device.getFetchesMessages()) sendNotificationGcmMessage(account, device, message);
-    else                             sendPayloadGcmMessage(account, device, message);
+    sendNotificationGcmMessage(account, device, message);
+//    else                             sendPayloadGcmMessage(account, device, message);
   }
 
   private void sendPayloadGcmMessage(Account account, Device device, Envelope message)