From 675b6f4b5e0b9c1d9208ff87ef9206bca4040021 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 27 Nov 2014 18:20:23 -0800 Subject: [PATCH] Update APN payload. // FREEBIE --- .../textsecuregcm/push/APNSender.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/whispersystems/textsecuregcm/push/APNSender.java b/src/main/java/org/whispersystems/textsecuregcm/push/APNSender.java index 7585a2121..d01366966 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/push/APNSender.java +++ b/src/main/java/org/whispersystems/textsecuregcm/push/APNSender.java @@ -68,7 +68,7 @@ public class APNSender implements Managed { private final Meter failureMeter = metricRegistry.meter(name(getClass(), "failure")); private final Logger logger = LoggerFactory.getLogger(APNSender.class); - private static final String MESSAGE_BODY = "m"; + private static final String PAYLOAD = "{\"aps\":{\"sound\":\"default\",\"alert\":{\"loc-key\":\"APN_Message\"},\"content-available\":1,\"category\":\"Signal_Message\"}}"; private static final ObjectMapper mapper = SystemMapper.getMapper(); @@ -115,7 +115,7 @@ public class APNSender implements Managed { storedMessages.insert(websocketAddress, message); if (!message.isReceipt()) { - sendPush(registrationId, serializedPendingMessage); + sendPush(registrationId); } } } catch (IOException e) { @@ -123,7 +123,7 @@ public class APNSender implements Managed { } } - private void sendPush(String registrationId, String message) + private void sendPush(String registrationId) throws TransientPushFailureException { try { @@ -132,14 +132,7 @@ public class APNSender implements Managed { throw new TransientPushFailureException("APN access not configured!"); } - String payload = APNS.newPayload() - .alertBody("Message!") - .customField(MESSAGE_BODY, message) - .build(); - - logger.debug("APN Payload: " + payload); - - apnService.get().push(registrationId, payload); + apnService.get().push(registrationId, PAYLOAD); pushMeter.mark(); } catch (NetworkIOException nioe) { logger.warn("Network Error", nioe);