webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 02:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Format timestamps as ISO 8601 in UTC

Browse source
This commit is contained in:
AsamK 2016-08-27 13:41:28 +02:00
parent e4618456a1
commit 293c176831
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/org/asamk/signal/Main.java
View file

@ -43,10 +43,9 @@ import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.security.Security; import java.security.Security;
import java.util.ArrayList; import java.text.DateFormat;
import java.util.List; import java.text.SimpleDateFormat;
import java.util.Locale; import java.util.*;
import java.util.Map;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
public class Main { public class Main {
@ -54,6 +53,8 @@ public class Main {
public static final String SIGNAL_BUSNAME = "org.asamk.Signal"; public static final String SIGNAL_BUSNAME = "org.asamk.Signal";
public static final String SIGNAL_OBJECTPATH = "/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) { public static void main(String[] args) {
// Workaround for BKS truststore // Workaround for BKS truststore
Security.insertProviderAt(new org.bouncycastle.jce.provider.BouncyCastleProvider(), 1); 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>() { dBusConn.addSigHandler(Signal.MessageReceived.class, new DBusSigHandler<Signal.MessageReceived>() {
@Override @Override
public void handle(Signal.MessageReceived s) { public void handle(Signal.MessageReceived s) {
System.out.print(String.format("Envelope from: %s\nTimestamp: %d\nBody: %s\n", System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",
s.getSender(), s.getTimestamp(), s.getMessage())); s.getSender(), formatTimestamp(s.getTimestamp()), s.getMessage()));
if (s.getGroupId().length > 0) { if (s.getGroupId().length > 0) {
System.out.println("Group info:"); System.out.println("Group info:");
System.out.println(" Id: " + Base64.encodeBytes(s.getGroupId())); System.out.println(" Id: " + Base64.encodeBytes(s.getGroupId()));
@ -772,7 +773,7 @@ public class Main {
if (source.getRelay().isPresent()) { if (source.getRelay().isPresent()) {
System.out.println("Relayed by: " + source.getRelay().get()); System.out.println("Relayed by: " + source.getRelay().get());
} }
System.out.println("Timestamp: " + envelope.getTimestamp()); System.out.println("Timestamp: " + formatTimestamp(envelope.getTimestamp()));
if (envelope.isReceipt()) { if (envelope.isReceipt()) {
System.out.println("Got receipt."); System.out.println("Got receipt.");
@ -810,7 +811,7 @@ public class Main {
System.out.println("Received sync read messages list"); System.out.println("Received sync read messages list");
for (ReadMessage rm : syncMessage.getRead().get()) { for (ReadMessage rm : syncMessage.getRead().get()) {
ContactInfo fromContact = m.getContact(rm.getSender()); 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()) { if (syncMessage.getRequest().isPresent()) {
@ -833,9 +834,9 @@ public class Main {
} else { } else {
to = "Unknown"; 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) { 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(); SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
handleSignalServiceDataMessage(message); handleSignalServiceDataMessage(message);
@ -857,7 +858,7 @@ public class Main {
} }
private void handleSignalServiceDataMessage(SignalServiceDataMessage message) { private void handleSignalServiceDataMessage(SignalServiceDataMessage message) {
System.out.println("Message timestamp: " + message.getTimestamp()); System.out.println("Message timestamp: " + formatTimestamp(message.getTimestamp()));
if (message.getBody().isPresent()) { if (message.getBody().isPresent()) {
System.out.println("Body: " + message.getBody().get()); 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) + ")";
}
} }