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

Use EpochSecondSerializer for UserRemoteConfigList.serverEpochTime

Browse Source
This commit is contained in:
Chris Eager
2023-11-29 14:52:40 -06:00
committed by Chris Eager
parent a05a230085
commit b1fd025ea6
5 changed files with 62 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
service/src/main/java/org/whispersystems/textsecuregcm/entities/UserRemoteConfigList.java
View File

@@ -7,10 +7,10 @@ package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.List;
import org.whispersystems.textsecuregcm.util.InstantAdapter;
public class UserRemoteConfigList {
@@ -18,6 +18,7 @@ public class UserRemoteConfigList {
private List<UserRemoteConfig> config;
@JsonProperty
@JsonSerialize(using = InstantAdapter.EpochSecondSerializer.class)
@JsonFormat(shape = JsonFormat.Shape.NUMBER_INT)
private Instant serverEpochTime;
@@ -25,7 +26,7 @@ public class UserRemoteConfigList {
public UserRemoteConfigList(List<UserRemoteConfig> config, Instant serverEpochTime) {
this.config = config;
this.serverEpochTime = serverEpochTime != null ? serverEpochTime.truncatedTo(ChronoUnit.SECONDS) : null;
this.serverEpochTime = serverEpochTime;
}
public List<UserRemoteConfig> getConfig() {