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

Add voip push support in communication with push server. 

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-03-25 15:59:52 -07:00
parent 1fcd1e33c5
commit e0f7ff325a
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/whispersystems/textsecuregcm/entities/ApnMessage.java
View File

@ -5,6 +5,7 @@ import com.google.common.annotations.VisibleForTesting;
import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
public class ApnMessage { public class ApnMessage {
@JsonProperty @JsonProperty
@ -23,12 +24,17 @@ public class ApnMessage {
@NotEmpty @NotEmpty
private String message; private String message;
@JsonProperty
@NotNull
private boolean voip;
public ApnMessage() {} public ApnMessage() {}
public ApnMessage(String apnId, String number, int deviceId, String message) { public ApnMessage(String apnId, String number, int deviceId, String message, boolean voip) {
this.apnId = apnId; this.apnId = apnId;
this.number = number; this.number = number;
this.deviceId = deviceId; this.deviceId = deviceId;
this.message = message; this.message = message;
this.voip = voip;
} }
} }

2
src/main/java/org/whispersystems/textsecuregcm/entities/ApnRegistrationId.java
View File

@ -26,7 +26,7 @@ public class ApnRegistrationId {
private String apnRegistrationId; private String apnRegistrationId;
@JsonProperty @JsonProperty
String voipRegistrationId; private String voipRegistrationId;
public String getApnRegistrationId() { public String getApnRegistrationId() {
return apnRegistrationId; return apnRegistrationId;

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

@ -25,6 +25,7 @@ import org.whispersystems.textsecuregcm.entities.GcmMessage;
import org.whispersystems.textsecuregcm.push.WebsocketSender.DeliveryStatus; import org.whispersystems.textsecuregcm.push.WebsocketSender.DeliveryStatus;
import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.storage.Account;
import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.Device;
import org.whispersystems.textsecuregcm.util.Util;
import static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal; import static org.whispersystems.textsecuregcm.entities.MessageProtos.OutgoingMessageSignal;
@ -99,8 +100,12 @@ public class PushSender {
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() != OutgoingMessageSignal.Type.RECEIPT_VALUE) { if (!deliveryStatus.isDelivered() && outgoingMessage.getType() != OutgoingMessageSignal.Type.RECEIPT_VALUE) {
ApnMessage apnMessage = new ApnMessage(device.getApnId(), account.getNumber(), (int)device.getId(), String apnId = Util.isEmpty(device.getVoipApnId()) ? device.getApnId() : device.getVoipApnId();
String.format(APN_PAYLOAD, deliveryStatus.getMessageQueueDepth())); boolean isVoip = !Util.isEmpty(device.getVoipApnId());
ApnMessage apnMessage = new ApnMessage(apnId, account.getNumber(), (int)device.getId(),
String.format(APN_PAYLOAD, deliveryStatus.getMessageQueueDepth()),
isVoip);
pushServiceClient.send(apnMessage); pushServiceClient.send(apnMessage);
} }
} }