Time to live hotfix #435
Closed
Time to live hotfix #435
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -190,4 +192,8 @@ public MessageType getMessageType(T message) { | |||
| return MessageType.UNKNOWN; | |||
| } | |||
| } | |||
|
|
|||
| private static int getValidTimeToLive(int ttl) { | |||
| return ValueRange.of(0, DEFAULT_TIME_TO_LIVE).isValidIntValue(ttl) ? ttl : DEFAULT_TIME_TO_LIVE; | |||
There was a problem hiding this comment.
you can simply do if comparison
return ttl >= 0 && ttl <= DEFAULT_TIME_TO_LIVE ? ttl : DEFAULT_TIME_TO_LIVE;
This will be much faster than comparing with a range.
| @@ -61,7 +61,7 @@ private static FcmDataMessage createMessageFromDataMessage(DataMessage dataMessa | |||
| .mutableContent(dataMessage.isMutableContent()) | |||
| .deliveryReceiptRequested(IS_DELIVERY_RECEIPT_REQUESTED) | |||
| .messageId(String.valueOf(dataMessage.getFcmMessageId())) | |||
| .timeToLive(Objects.requireNonNullElse(dataMessage.getTtlSeconds(), 2_419_200)) | |||
| .timeToLive(getValidTimeToLive(dataMessage.getTtlSeconds())) | |||
There was a problem hiding this comment.
I would move this check to the FcmSender in the fcm package as this a FCM level restriction rather than of the appserver. This would ensure any future uses elsewhere of the send fcm function works as expected too.
|
Closing as this hotfix has been released. Also been added to: #434 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://firebase.google.com/docs/cloud-messaging/concept-options#:~:text=On%20Android%20and%20Web%2FJavaScript,attempts%20to%20deliver%20the%20message.