From 85509c6d8b6e39c6f5b005a6a8d55667dfc17888 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Tue, 1 Dec 2015 10:58:43 -0800 Subject: [PATCH] Don't need to send payload GCM messages any longer. // FREEBIE --- .../textsecuregcm/push/PushSender.java | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java b/src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java index 571b6591c..a7b57810f 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java +++ b/src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java @@ -63,28 +63,9 @@ public class PushSender { } private void sendGcmMessage(Account account, Device device, Envelope message) - throws TransientPushFailureException, NotPushRegisteredException + throws TransientPushFailureException { sendNotificationGcmMessage(account, device, message); -// else sendPayloadGcmMessage(account, device, message); - } - - private void sendPayloadGcmMessage(Account account, Device device, Envelope message) - throws TransientPushFailureException, NotPushRegisteredException - { - try { - String number = account.getNumber(); - long deviceId = device.getId(); - String registrationId = device.getGcmId(); - boolean isReceipt = message.getType() == Envelope.Type.RECEIPT; - EncryptedOutgoingMessage encryptedMessage = new EncryptedOutgoingMessage(message, device.getSignalingKey()); - GcmMessage gcmMessage = new GcmMessage(registrationId, number, (int) deviceId, - encryptedMessage.toEncodedString(), isReceipt, false); - - pushServiceClient.send(gcmMessage); - } catch (CryptoEncodingException e) { - throw new NotPushRegisteredException(e); - } } private void sendNotificationGcmMessage(Account account, Device device, Envelope message)