Skip to content
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.

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

Remove sender ID and log unavailable #127

Merged
merged 1 commit into from
Sep 10, 2024
Merged
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions server/android_notification_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ const (
thirdPartyAuthError = "THIRD_PARTY_AUTH_ERROR"
invalidArgument = "INVALID_ARGUMENT"
quotaExceeded = "QUOTA_EXCEEDED"
senderIDMismatch = "SENDER_ID_MISMATCH"
unregistered = "UNREGISTERED"
unavailable = "UNAVAILABLE"
tokenSourceError = "TOKEN_SOURCE_ERROR"
Expand Down Expand Up @@ -193,7 +192,7 @@ func (me *AndroidNotificationServer) SendNotification(msg *PushNotification) Pus
errorCode,
)

if messaging.IsUnregistered(err) {
if messaging.IsUnregistered(err) || messaging.IsSenderIDMismatch(err) {
me.logger.Infof("Android response failure sending remove code: type=%v", me.AndroidPushSettings.Type)
if me.metrics != nil {
me.metrics.incrementRemoval(PushNotifyAndroid, pushType, unregistered)
Expand All @@ -209,10 +208,10 @@ func (me *AndroidNotificationServer) SendNotification(msg *PushNotification) Pus
reason = invalidArgument
case messaging.IsQuotaExceeded(err):
reason = quotaExceeded
case messaging.IsSenderIDMismatch(err):
reason = senderIDMismatch
case messaging.IsThirdPartyAuthError(err):
reason = thirdPartyAuthError
case messaging.IsUnavailable(err):
reason = unavailable
default:
reason = "unknown transport error"

Expand Down
Loading