Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 11:48:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rely on the client presence manager to decide whether to send push notifications.

Browse Source
This commit is contained in:
Jon Chambers
2020-09-01 16:59:57 -04:00
committed by Jon Chambers
parent 697c380cd1
commit ad01610d1e
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
service/src/main/java/org/whispersystems/textsecuregcm/push/WebsocketSender.java
View File

@@ -67,14 +67,10 @@ public class WebsocketSender {
private final PubSubManager pubSubManager;
private final ClientPresenceManager clientPresenceManager;
private final Experiment presenceExperiment = new Experiment("presence", "websocketSender");
private final Executor experimentExecutor;
public WebsocketSender(MessagesManager messagesManager, PubSubManager pubSubManager, ClientPresenceManager clientPresenceManager, Executor experimentExecutor) {
public WebsocketSender(MessagesManager messagesManager, PubSubManager pubSubManager, ClientPresenceManager clientPresenceManager) {
this.messagesManager = messagesManager;
this.pubSubManager = pubSubManager;
this.clientPresenceManager = clientPresenceManager;
this.experimentExecutor = experimentExecutor;
}
public DeliveryStatus sendMessage(Account account, Device device, Envelope message, Type channel, boolean online) {
@@ -84,11 +80,9 @@ public class WebsocketSender {
.setContent(message.toByteString())
.build();
final boolean clientPresent = pubSubManager.publish(address, pubSubMessage);
pubSubManager.publish(address, pubSubMessage);
presenceExperiment.compareSupplierResultAsync(clientPresent, () -> clientPresenceManager.isPresent(account.getUuid(), device.getId()), experimentExecutor);
if (clientPresent) {
if (clientPresenceManager.isPresent(account.getUuid(), device.getId())) {
if (channel == Type.APN) apnOnlineMeter.mark();
else if (channel == Type.GCM) gcmOnlineMeter.mark();
else websocketOnlineMeter.mark();