Skip to content

Fix bug, when APNs server closed the connection. #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bug, when APNs server closed the connection. #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/com/notnoop/apns/DeliveryError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public enum DeliveryError {
INVALID_TOPIC_SIZE(6),
INVALID_PAYLOAD_SIZE(7),
INVALID_TOKEN(8),
SHUTDOWN(10),

NONE(255),
UNKNOWN(254);
Expand Down
17 changes: 12 additions & 5 deletions src/main/java/com/notnoop/apns/internal/ApnsConnectionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,9 @@ public void run() {
Utilities.close(socket);

int command = bytes[0] & 0xFF;
if (command != 8) {
// A status code of 10 indicates that the APNs server closed the connection,
// The notification identifier in the error response indicates the last notification that was successfully sent.
if (command != 8 && command != 10) {
throw new IOException("Unexpected command byte " + command);
}
int statusCode = bytes[1] & 0xFF;
Expand Down Expand Up @@ -185,8 +187,10 @@ public void run() {
}

if (foundNotification) {
logger.debug("delegate.messageSendFailed, message id {}", notification.getIdentifier());
delegate.messageSendFailed(notification, new ApnsDeliveryErrorException(e));
if (DeliveryError.INVALID_TOKEN == e) {
logger.debug("delegate.messageSendFailed, message id {}", notification.getIdentifier());
delegate.messageSendFailed(notification, new ApnsDeliveryErrorException(e));
}
} else {
cachedNotifications.addAll(tempCache);
int resendSize = tempCache.size();
Expand All @@ -195,8 +199,11 @@ public void run() {
cacheLength = cacheLength + (resendSize / 2);
delegate.cacheLengthExceeded(cacheLength);
}
logger.debug("delegate.messageSendFailed, unknown id");
delegate.messageSendFailed(null, new ApnsDeliveryErrorException(e));

if (DeliveryError.INVALID_TOKEN == e) {
logger.debug("delegate.messageSendFailed, unknown id");
delegate.messageSendFailed(null, new ApnsDeliveryErrorException(e));
}
}

int resendSize = 0;
Expand Down