Skip to content

fix(fcm): Fix issues in event_time timestamp parsing #338

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

Merged
merged 4 commits into from
Dec 19, 2019
Merged

fix(fcm): Fix issues in event_time timestamp parsing #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e480d89
fix issues in event_time timestamp conversion
chong-shao Dec 19, 2019
cd4c7aa
fix the formatting issue in event_time timestamp
chong-shao Dec 19, 2019
fe12bf2
fix a typo/bug
chong-shao Dec 19, 2019
ba82e2c
remove unecessary dependency
chong-shao Dec 19, 2019
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
6 changes: 4 additions & 2 deletions src/main/java/com/google/firebase/messaging/AndroidNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;

/**
Expand Down Expand Up @@ -456,8 +457,9 @@ public Builder setSticky(boolean sticky) {
* @return This builder.
*/
public Builder setEventTimeInMillis(long eventTimeInMillis) {
this.eventTime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS'Z'")
.format(new Date(eventTimeInMillis));
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS000000'Z'");
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
this.eventTime = dateFormat.format(new Date(eventTimeInMillis));
return this;
}

Expand Down
4 changes: 1 addition & 3 deletions src/test/java/com/google/firebase/messaging/MessageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,15 +859,13 @@ public void testExtendedAndroidNotificationParameters() throws IOException {
.put("title", "title")
.put("body", "body")
.build();
String eventTime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS'Z'", Locale.US)
.format(new Date(1546304523123L));
Map<String, Object> androidConfig = ImmutableMap.<String, Object>builder()
.put("notification", ImmutableMap.<String, Object>builder()
.put("title", "android-title")
.put("body", "android-body")
.put("ticker", "ticker")
.put("sticky", true)
.put("event_time", eventTime)
.put("event_time", "2019-01-01T01:02:03.123000000Z")
.put("local_only", true)
.put("notification_priority", "PRIORITY_HIGH")
.put("vibrate_timings", ImmutableList.of("1s", "1.001000000s"))
Expand Down