diff options
author | Jonathan Bauer | 2015-09-07 13:15:50 +0200 |
---|---|---|
committer | Jonathan Bauer | 2015-09-07 13:15:50 +0200 |
commit | 409749c8df2aef48164a242cb150dd8bafb162ae (patch) | |
tree | e55f5e32523835310a2dbedd56cb30f6cec9c59b /dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java | |
parent | Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1 (diff) | |
download | tutor-module-409749c8df2aef48164a242cb150dd8bafb162ae.tar.gz tutor-module-409749c8df2aef48164a242cb150dd8bafb162ae.tar.xz tutor-module-409749c8df2aef48164a242cb150dd8bafb162ae.zip |
[client] better CheckUpdateWindow layout and format the dates
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java index f7b75abf..beb96bb2 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java @@ -96,8 +96,11 @@ public class ClientVersion { } if (manifestRev != null) localRevision = manifestRev; - if (manifestRevTime != null) + if (manifestRevTime != null) { localRevisionTime = Long.valueOf(manifestRevTime); + // hax since we get milliseconds not seconds + localRevisionTime = localRevisionTime / 1000L; + } LOGGER.info("Local revision: " + localRevision); LOGGER.info("Local revision timestamp: " + localRevisionTime); @@ -130,8 +133,10 @@ public class ClientVersion { VersionQuery query = gson.fromJson(json, VersionQuery.class); if (query.revision != null) remoteRevision = query.revision; - if (query.timestamp != null) + if (query.timestamp != null) { + // seconds timestamp here... remoteRevisionTime = query.timestamp; + } LOGGER.debug("Remote revision: " + remoteRevision); LOGGER.debug("Remote timestamp: " + remoteRevisionTime); } |