Format timestamps as ISO 8601 in UTC

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 8a1dd860b42b943a7a65718378f3e0db19f0758e..d70b00cbd6bea18b8a40ce6175639ad88b3b964b 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -43,10 +43,9 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 import java.security.Security;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.concurrent.TimeoutException;
 
 public class Main {
@@ -54,6 +53,8 @@ public class Main {
     public static final String SIGNAL_BUSNAME = "org.asamk.Signal";
     public static final String SIGNAL_OBJECTPATH = "/org/asamk/Signal";
 
+    private static final TimeZone tzUTC = TimeZone.getTimeZone("UTC");
+
     public static void main(String[] args) {
         // Workaround for BKS truststore
         Security.insertProviderAt(new org.bouncycastle.jce.provider.BouncyCastleProvider(), 1);
@@ -327,8 +328,8 @@ public class Main {
                             dBusConn.addSigHandler(Signal.MessageReceived.class, new DBusSigHandler<Signal.MessageReceived>() {
                                 @Override
                                 public void handle(Signal.MessageReceived s) {
-                                    System.out.print(String.format("Envelope from: %s\nTimestamp: %d\nBody: %s\n",
-                                            s.getSender(), s.getTimestamp(), s.getMessage()));
+                                    System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",
+                                            s.getSender(), formatTimestamp(s.getTimestamp()), s.getMessage()));
                                     if (s.getGroupId().length > 0) {
                                         System.out.println("Group info:");
                                         System.out.println("  Id: " + Base64.encodeBytes(s.getGroupId()));
@@ -772,7 +773,7 @@ public class Main {
             if (source.getRelay().isPresent()) {
                 System.out.println("Relayed by: " + source.getRelay().get());
             }
-            System.out.println("Timestamp: " + envelope.getTimestamp());
+            System.out.println("Timestamp: " + formatTimestamp(envelope.getTimestamp()));
 
             if (envelope.isReceipt()) {
                 System.out.println("Got receipt.");
@@ -810,7 +811,7 @@ public class Main {
                             System.out.println("Received sync read messages list");
                             for (ReadMessage rm : syncMessage.getRead().get()) {
                                 ContactInfo fromContact = m.getContact(rm.getSender());
-                                System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + rm.getTimestamp());
+                                System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + formatTimestamp(rm.getTimestamp()));
                             }
                         }
                         if (syncMessage.getRequest().isPresent()) {
@@ -833,9 +834,9 @@ public class Main {
                             } else {
                                 to = "Unknown";
                             }
-                            System.out.println("To: " + to + " , Message timestamp: " + sentTranscriptMessage.getTimestamp());
+                            System.out.println("To: " + to + " , Message timestamp: " + formatTimestamp(sentTranscriptMessage.getTimestamp()));
                             if (sentTranscriptMessage.getExpirationStartTimestamp() > 0) {
-                                System.out.println("Expiration started at: " + sentTranscriptMessage.getExpirationStartTimestamp());
+                                System.out.println("Expiration started at: " + formatTimestamp(sentTranscriptMessage.getExpirationStartTimestamp()));
                             }
                             SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
                             handleSignalServiceDataMessage(message);
@@ -857,7 +858,7 @@ public class Main {
         }
 
         private void handleSignalServiceDataMessage(SignalServiceDataMessage message) {
-            System.out.println("Message timestamp: " + message.getTimestamp());
+            System.out.println("Message timestamp: " + formatTimestamp(message.getTimestamp()));
 
             if (message.getBody().isPresent()) {
                 System.out.println("Body: " + message.getBody().get());
@@ -962,4 +963,11 @@ public class Main {
         }
 
     }
+
+    private static String formatTimestamp(long timestamp) {
+        Date date = new Date(timestamp);
+        final DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); // Quoted "Z" to indicate UTC, no timezone offset
+        df.setTimeZone(tzUTC);
+        return timestamp + " (" + df.format(date) + ")";
+    }
 }