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

Don't send APN fallbacks for sync messages 

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2016-09-14 16:40:33 -07:00
parent 26b552a12e
commit 7b60ae26fc
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,11 +87,11 @@ public class PushSender implements Managed {
} }
} }
public void sendQueuedNotification(Account account, Device device, int messageQueueDepth) public void sendQueuedNotification(Account account, Device device, int messageQueueDepth, boolean fallback)
throws NotPushRegisteredException, TransientPushFailureException throws NotPushRegisteredException, TransientPushFailureException
{ {
if (device.getGcmId() != null) sendGcmNotification(account, device); if (device.getGcmId() != null) sendGcmNotification(account, device);
else if (device.getApnId() != null) sendApnNotification(account, device, messageQueueDepth); else if (device.getApnId() != null) sendApnNotification(account, device, messageQueueDepth, fallback);
else if (!device.getFetchesMessages()) throw new NotPushRegisteredException("No notification possible!"); else if (!device.getFetchesMessages()) throw new NotPushRegisteredException("No notification possible!");
} }
@ -129,11 +129,12 @@ public class PushSender implements Managed {
DeliveryStatus deliveryStatus = webSocketSender.sendMessage(account, device, outgoingMessage, WebsocketSender.Type.APN); DeliveryStatus deliveryStatus = webSocketSender.sendMessage(account, device, outgoingMessage, WebsocketSender.Type.APN);
if (!deliveryStatus.isDelivered() && outgoingMessage.getType() != Envelope.Type.RECEIPT) { if (!deliveryStatus.isDelivered() && outgoingMessage.getType() != Envelope.Type.RECEIPT) {
sendApnNotification(account, device, deliveryStatus.getMessageQueueDepth()); boolean fallback = !outgoingMessage.getSource().equals(account.getNumber());
sendApnNotification(account, device, deliveryStatus.getMessageQueueDepth(), fallback);
} }
} }
private void sendApnNotification(Account account, Device device, int messageQueueDepth) { private void sendApnNotification(Account account, Device device, int messageQueueDepth, boolean fallback) {
ApnMessage apnMessage; ApnMessage apnMessage;
if (!Util.isEmpty(device.getVoipApnId())) { if (!Util.isEmpty(device.getVoipApnId())) {
@ -141,8 +142,10 @@ public class PushSender implements Managed {
String.format(APN_PAYLOAD, messageQueueDepth), String.format(APN_PAYLOAD, messageQueueDepth),
true, System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(30)); true, System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(30));
if (fallback) {
apnFallbackManager.schedule(new WebsocketAddress(account.getNumber(), device.getId()), apnFallbackManager.schedule(new WebsocketAddress(account.getNumber(), device.getId()),
new ApnFallbackTask(device.getApnId(), apnMessage)); new ApnFallbackTask(device.getApnId(), apnMessage));
}
} else { } else {
apnMessage = new ApnMessage(device.getApnId(), account.getNumber(), (int)device.getId(), apnMessage = new ApnMessage(device.getApnId(), account.getNumber(), (int)device.getId(),
String.format(APN_PAYLOAD, messageQueueDepth), String.format(APN_PAYLOAD, messageQueueDepth),

3
src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
View File

@ -141,9 +141,10 @@ public class WebSocketConnection implements DispatchChannel {
private void requeueMessage(Envelope message) { private void requeueMessage(Envelope message) {
int queueDepth = pushSender.getWebSocketSender().queueMessage(account, device, message); int queueDepth = pushSender.getWebSocketSender().queueMessage(account, device, message);
boolean fallback = !message.getSource().equals(account.getNumber());
try { try {
pushSender.sendQueuedNotification(account, device, queueDepth); pushSender.sendQueuedNotification(account, device, queueDepth, fallback);
} catch (NotPushRegisteredException | TransientPushFailureException e) { } catch (NotPushRegisteredException | TransientPushFailureException e) {
logger.warn("requeueMessage", e); logger.warn("requeueMessage", e);
} }

2
src/test/java/org/whispersystems/textsecuregcm/tests/websocket/WebSocketConnectionTest.java
View File

@ -250,7 +250,7 @@ public class WebSocketConnectionTest {
verify(receiptSender, times(1)).sendReceipt(eq(account), eq("sender2"), eq(secondMessage.getTimestamp()), eq(Optional.<String>absent())); verify(receiptSender, times(1)).sendReceipt(eq(account), eq("sender2"), eq(secondMessage.getTimestamp()), eq(Optional.<String>absent()));
verify(websocketSender, times(1)).queueMessage(eq(account), eq(device), any(Envelope.class)); verify(websocketSender, times(1)).queueMessage(eq(account), eq(device), any(Envelope.class));
verify(pushSender, times(1)).sendQueuedNotification(eq(account), eq(device), eq(10)); verify(pushSender, times(1)).sendQueuedNotification(eq(account), eq(device), eq(10), eq(true));
connection.onDispatchUnsubscribed(websocketAddress.serialize()); connection.onDispatchUnsubscribed(websocketAddress.serialize());
verify(client).close(anyInt(), anyString()); verify(client).close(anyInt(), anyString());