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

Update to Pushy v0.14.1.

Browse Source
This commit is contained in:
Jon Chambers
2020-06-05 10:19:47 -04:00
committed by Jon Chambers
parent 228ffcbfce
commit ba6ac778fc
4 changed files with 35 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/main/java/org/whispersystems/textsecuregcm/push/APNSender.java
View File

@@ -37,7 +37,7 @@ import javax.annotation.Nullable;
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.Date;
import java.time.Instant;
import java.util.Optional;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -92,7 +92,7 @@ public class APNSender implements Managed {
ListenableFuture<ApnResult> future = apnsClient.send(message.getApnId(), topic,
message.getMessage(),
new Date(message.getExpirationTime()));
Instant.ofEpochMilli(message.getExpirationTime()));
Futures.addCallback(future, new FutureCallback<ApnResult>() {
@Override

30
service/src/main/java/org/whispersystems/textsecuregcm/push/RetryingApnsClient.java
View File

@@ -13,7 +13,6 @@ import com.eatthepath.pushy.apns.util.SimpleApnsPushNotification;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import io.netty.util.concurrent.GenericFutureListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.whispersystems.textsecuregcm.util.Constants;
@@ -22,9 +21,9 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.Date;
import java.time.Instant;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.function.BiConsumer;
import static com.codahale.metrics.MetricRegistry.name;
@@ -55,11 +54,11 @@ public class RetryingApnsClient {
this.apnsClient = apnsClient;
}
ListenableFuture<ApnResult> send(final String apnId, final String topic, final String payload, final Date expiration) {
ListenableFuture<ApnResult> send(final String apnId, final String topic, final String payload, final Instant expiration) {
SettableFuture<ApnResult> result = SettableFuture.create();
SimpleApnsPushNotification notification = new SimpleApnsPushNotification(apnId, topic, payload, expiration, DeliveryPriority.IMMEDIATE);
apnsClient.sendNotification(notification).addListener(new ResponseHandler(result));
apnsClient.sendNotification(notification).whenComplete(new ResponseHandler(result));
return result;
}
@@ -68,7 +67,7 @@ public class RetryingApnsClient {
apnsClient.close();
}
private static final class ResponseHandler implements GenericFutureListener<io.netty.util.concurrent.Future<PushNotificationResponse<SimpleApnsPushNotification>>> {
private static final class ResponseHandler implements BiConsumer<PushNotificationResponse<SimpleApnsPushNotification>, Throwable> {
private final SettableFuture<ApnResult> future;
@@ -77,27 +76,20 @@ public class RetryingApnsClient {
}
@Override
public void operationComplete(io.netty.util.concurrent.Future<PushNotificationResponse<SimpleApnsPushNotification>> result) {
try {
PushNotificationResponse<SimpleApnsPushNotification> response = result.get();
public void accept(final PushNotificationResponse<SimpleApnsPushNotification> response, final Throwable cause) {
if (response != null) {
if (response.isAccepted()) {
future.set(new ApnResult(ApnResult.Status.SUCCESS, null));
} else if ("Unregistered".equals(response.getRejectionReason()) ||
"BadDeviceToken".equals(response.getRejectionReason()))
{
"BadDeviceToken".equals(response.getRejectionReason())) {
future.set(new ApnResult(ApnResult.Status.NO_SUCH_USER, response.getRejectionReason()));
} else {
logger.warn("Got APN failure: " + response.getRejectionReason());
future.set(new ApnResult(ApnResult.Status.GENERIC_FAILURE, response.getRejectionReason()));
}
} catch (InterruptedException e) {
logger.warn("Interrupted exception", e);
future.setException(e);
} catch (ExecutionException e) {
logger.warn("Execution exception", e);
future.setException(e.getCause());
} else {
logger.warn("Execution exception", cause);
future.setException(cause);
}
}
}