Re-order imports to match original structure

[signal-cli] / src / main / java / org / asamk / signal / Main.java

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 40e28d25673213216af1b5bf186653c4e6f23253..571f9d42a706b6dd8588ee6b3d434b51c3e1d39a 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -21,6 +21,11 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;
 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;
 import net.sourceforge.argparse4j.inf.*;
 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;

+import org.asamk.signal.storage.contacts.ContactInfo;
+import org.asamk.signal.storage.groups.GroupInfo;
+import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
+import org.asamk.signal.util.Base64;
+import org.asamk.signal.util.Hex;

 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.DBusSigHandler;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.DBusSigHandler;
 import org.freedesktop.dbus.exceptions.DBusException;


@@ -28,10 +33,7 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.messages.*;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.messages.*;

-import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo;
-import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.*;

 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
 import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
 import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;


@@ -46,10 +48,10 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 import java.security.Security;
 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.TimeUnit;

 import java.util.concurrent.TimeoutException;
 
 public class Main {
 import java.util.concurrent.TimeoutException;
 
 public class Main {


@@ -57,6 +59,8 @@ public class Main {
     public static final String SIGNAL_BUSNAME = "org.asamk.Signal";
     public static final String SIGNAL_OBJECTPATH = "/org/asamk/Signal";
 
     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);
     public static void main(String[] args) {
         // Workaround for BKS truststore
         Security.insertProviderAt(new org.bouncycastle.jce.provider.BouncyCastleProvider(), 1);


@@ -89,6 +93,9 @@ public class Main {
                     ts = (Signal) dBusConn.getRemoteObject(
                             SIGNAL_BUSNAME, SIGNAL_OBJECTPATH,
                             Signal.class);
                     ts = (Signal) dBusConn.getRemoteObject(
                             SIGNAL_BUSNAME, SIGNAL_OBJECTPATH,
                             Signal.class);

+                } catch (UnsatisfiedLinkError e) {
+                    System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
+                    return 1;

                 } catch (DBusException e) {
                     e.printStackTrace();
                     if (dBusConn != null) {
                 } catch (DBusException e) {
                     e.printStackTrace();
                     if (dBusConn != null) {


@@ -112,7 +119,7 @@ public class Main {
                 ts = m;
                 if (m.userExists()) {
                     try {
                 ts = m;
                 if (m.userExists()) {
                     try {

-                        m.load();
+                        m.init();

                     } catch (Exception e) {
                         System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage());
                         return 2;
                     } catch (Exception e) {
                         System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage());
                         return 2;


@@ -136,6 +143,38 @@ public class Main {
                         return 3;
                     }
                     break;
                         return 3;
                     }
                     break;

+                case "unregister":
+                    if (dBusConn != null) {
+                        System.err.println("unregister is not yet implemented via dbus");
+                        return 1;
+                    }
+                    if (!m.isRegistered()) {
+                        System.err.println("User is not registered.");
+                        return 1;
+                    }
+                    try {
+                        m.unregister();
+                    } catch (IOException e) {
+                        System.err.println("Unregister error: " + e.getMessage());
+                        return 3;
+                    }
+                    break;
+                case "updateAccount":
+                    if (dBusConn != null) {
+                        System.err.println("updateAccount is not yet implemented via dbus");
+                        return 1;
+                    }
+                    if (!m.isRegistered()) {
+                        System.err.println("User is not registered.");
+                        return 1;
+                    }
+                    try {
+                        m.updateAccountAttributes();
+                    } catch (IOException e) {
+                        System.err.println("UpdateAccount error: " + e.getMessage());
+                        return 3;
+                    }
+                    break;

                 case "verify":
                     if (dBusConn != null) {
                         System.err.println("verify is not yet implemented via dbus");
                 case "verify":
                     if (dBusConn != null) {
                         System.err.println("verify is not yet implemented via dbus");


@@ -179,6 +218,9 @@ public class Main {
                     } catch (IOException e) {
                         System.err.println("Link request error: " + e.getMessage());
                         return 3;
                     } catch (IOException e) {
                         System.err.println("Link request error: " + e.getMessage());
                         return 3;

+                    } catch (AssertionError e) {
+                        handleAssertionError(e);
+                        return 1;

                     } catch (InvalidKeyException e) {
                         e.printStackTrace();
                         return 2;
                     } catch (InvalidKeyException e) {
                         e.printStackTrace();
                         return 2;


@@ -204,6 +246,9 @@ public class Main {
                     } catch (InvalidKeyException e) {
                         e.printStackTrace();
                         return 2;
                     } catch (InvalidKeyException e) {
                         e.printStackTrace();
                         return 2;

+                    } catch (AssertionError e) {
+                        handleAssertionError(e);
+                        return 1;

                     } catch (URISyntaxException e) {
                         e.printStackTrace();
                         return 2;
                     } catch (URISyntaxException e) {
                         e.printStackTrace();
                         return 2;


@@ -223,8 +268,8 @@ public class Main {
                         for (DeviceInfo d : devices) {
                             System.out.println("Device " + d.getId() + (d.getId() == m.getDeviceId() ? " (this device)" : "") + ":");
                             System.out.println(" Name: " + d.getName());
                         for (DeviceInfo d : devices) {
                             System.out.println("Device " + d.getId() + (d.getId() == m.getDeviceId() ? " (this device)" : "") + ":");
                             System.out.println(" Name: " + d.getName());

-                            System.out.println(" Created: " + d.getCreated());
-                            System.out.println(" Last seen: " + d.getLastSeen());
+                            System.out.println(" Created: " + formatTimestamp(d.getCreated()));
+                            System.out.println(" Last seen: " + formatTimestamp(d.getLastSeen()));

                         }
                     } catch (IOException e) {
                         e.printStackTrace();
                         }
                     } catch (IOException e) {
                         e.printStackTrace();


@@ -330,8 +375,8 @@ public class Main {
                             dBusConn.addSigHandler(Signal.MessageReceived.class, new DBusSigHandler<Signal.MessageReceived>() {
                                 @Override
                                 public void handle(Signal.MessageReceived s) {
                             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()));
                                     if (s.getGroupId().length > 0) {
                                         System.out.println("Group info:");
                                         System.out.println("  Id: " + Base64.encodeBytes(s.getGroupId()));


@@ -345,6 +390,9 @@ public class Main {
                                     System.out.println();
                                 }
                             });
                                     System.out.println();
                                 }
                             });

+                        } catch (UnsatisfiedLinkError e) {
+                            System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
+                            return 1;

                         } catch (DBusException e) {
                             e.printStackTrace();
                             return 1;
                         } catch (DBusException e) {
                             e.printStackTrace();
                             return 1;


@@ -361,17 +409,18 @@ public class Main {
                         System.err.println("User is not registered.");
                         return 1;
                     }
                         System.err.println("User is not registered.");
                         return 1;
                     }

-                    int timeout = 5;
-                    if (ns.getInt("timeout") != null) {
-                        timeout = ns.getInt("timeout");
+                    double timeout = 5;
+                    if (ns.getDouble("timeout") != null) {
+                        timeout = ns.getDouble("timeout");

                     }
                     boolean returnOnTimeout = true;
                     if (timeout < 0) {
                         returnOnTimeout = false;
                         timeout = 3600;
                     }
                     }
                     boolean returnOnTimeout = true;
                     if (timeout < 0) {
                         returnOnTimeout = false;
                         timeout = 3600;
                     }

+                    boolean ignoreAttachments = ns.getBoolean("ignore_attachments");

                     try {
                     try {

-                        m.receiveMessages(timeout, returnOnTimeout, new ReceiveMessageHandler(m));
+                        m.receiveMessages((long) (timeout * 1000), TimeUnit.MILLISECONDS, returnOnTimeout, ignoreAttachments, new ReceiveMessageHandler(m));

                     } catch (IOException e) {
                         System.err.println("Error while receiving messages: " + e.getMessage());
                         return 3;
                     } catch (IOException e) {
                         System.err.println("Error while receiving messages: " + e.getMessage());
                         return 3;


@@ -447,6 +496,23 @@ public class Main {
                         return 3;
                     }
 
                         return 3;
                     }
 

+                    break;
+                case "listGroups":
+                    if (dBusConn != null) {
+                        System.err.println("listGroups is not yet implemented via dbus");
+                        return 1;
+                    }
+                    if (!m.isRegistered()) {
+                        System.err.println("User is not registered.");
+                        return 1;
+                    }
+    
+                    List<GroupInfo> groups = m.getGroups();
+                    boolean detailed = ns.getBoolean("detailed");
+    
+                    for (GroupInfo group : groups) {
+                        printGroup(group, detailed);
+                    }

                     break;
                 case "listIdentities":
                     if (dBusConn != null) {
                     break;
                 case "listIdentities":
                     if (dBusConn != null) {


@@ -460,13 +526,13 @@ public class Main {
                     if (ns.get("number") == null) {
                         for (Map.Entry<String, List<JsonIdentityKeyStore.Identity>> keys : m.getIdentities().entrySet()) {
                             for (JsonIdentityKeyStore.Identity id : keys.getValue()) {
                     if (ns.get("number") == null) {
                         for (Map.Entry<String, List<JsonIdentityKeyStore.Identity>> keys : m.getIdentities().entrySet()) {
                             for (JsonIdentityKeyStore.Identity id : keys.getValue()) {

-                                System.out.println(String.format("%s: %s Added: %s Fingerprint: %s", keys.getKey(), id.trustLevel, id.added, Hex.toStringCondensed(id.getFingerprint())));
+                                printIdentityFingerprint(m, keys.getKey(), id);

                             }
                         }
                     } else {
                         String number = ns.getString("number");
                         for (JsonIdentityKeyStore.Identity id : m.getIdentities(number)) {
                             }
                         }
                     } else {
                         String number = ns.getString("number");
                         for (JsonIdentityKeyStore.Identity id : m.getIdentities(number)) {

-                            System.out.println(String.format("%s: %s Added: %s Fingerprint: %s", number, id.trustLevel, id.added, Hex.toStringCondensed(id.getFingerprint())));
+                            printIdentityFingerprint(m, number, id);

                         }
                     }
                     break;
                         }
                     }
                     break;


@@ -489,16 +555,28 @@ public class Main {
                     } else {
                         String fingerprint = ns.getString("verified_fingerprint");
                         if (fingerprint != null) {
                     } else {
                         String fingerprint = ns.getString("verified_fingerprint");
                         if (fingerprint != null) {

-                            byte[] fingerprintBytes;
-                            try {
-                                fingerprintBytes = Hex.toByteArray(fingerprint.replaceAll(" ", "").toLowerCase(Locale.ROOT));
-                            } catch (Exception e) {
-                                System.err.println("Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
-                                return 1;
-                            }
-                            boolean res = m.trustIdentityVerified(number, fingerprintBytes);
-                            if (!res) {
-                                System.err.println("Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
+                            fingerprint = fingerprint.replaceAll(" ", "");
+                            if (fingerprint.length() == 66) {
+                                byte[] fingerprintBytes;
+                                try {
+                                    fingerprintBytes = Hex.toByteArray(fingerprint.toLowerCase(Locale.ROOT));
+                                } catch (Exception e) {
+                                    System.err.println("Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
+                                    return 1;
+                                }
+                                boolean res = m.trustIdentityVerified(number, fingerprintBytes);
+                                if (!res) {
+                                    System.err.println("Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
+                                    return 1;
+                                }
+                            } else if (fingerprint.length() == 60) {
+                                boolean res = m.trustIdentityVerifiedSafetyNumber(number, fingerprint);
+                                if (!res) {
+                                    System.err.println("Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");
+                                    return 1;
+                                }
+                            } else {
+                                System.err.println("Fingerprint has invalid format, either specify the old hex fingerprint or the new safety number");

                                 return 1;
                             }
                         } else {
                                 return 1;
                             }
                         } else {


@@ -528,12 +606,16 @@ public class Main {
                             conn = DBusConnection.getConnection(busType);
                             conn.exportObject(SIGNAL_OBJECTPATH, m);
                             conn.requestBusName(SIGNAL_BUSNAME);
                             conn = DBusConnection.getConnection(busType);
                             conn.exportObject(SIGNAL_OBJECTPATH, m);
                             conn.requestBusName(SIGNAL_BUSNAME);

+                        } catch (UnsatisfiedLinkError e) {
+                            System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
+                            return 1;

                         } catch (DBusException e) {
                             e.printStackTrace();
                             return 2;
                         }
                         } catch (DBusException e) {
                             e.printStackTrace();
                             return 2;
                         }

+                        ignoreAttachments = ns.getBoolean("ignore_attachments");

                         try {
                         try {

-                            m.receiveMessages(3600, false, new DbusReceiveMessageHandler(m, conn));
+                            m.receiveMessages(1, TimeUnit.HOURS, false, ignoreAttachments, new DbusReceiveMessageHandler(m, conn));

                         } catch (IOException e) {
                             System.err.println("Error while receiving messages: " + e.getMessage());
                             return 3;
                         } catch (IOException e) {
                             System.err.println("Error while receiving messages: " + e.getMessage());
                             return 3;


@@ -557,6 +639,32 @@ public class Main {
         }
     }
 
         }
     }
 

+    private static void printIdentityFingerprint(Manager m, String theirUsername, JsonIdentityKeyStore.Identity theirId) {
+        String digits = formatSafetyNumber(m.computeSafetyNumber(theirUsername, theirId.getIdentityKey()));
+        System.out.println(String.format("%s: %s Added: %s Fingerprint: %s Safety Number: %s", theirUsername,
+                theirId.getTrustLevel(), theirId.getDateAdded(), Hex.toStringCondensed(theirId.getFingerprint()), digits));
+    }
+    
+    private static void printGroup(GroupInfo group, boolean detailed) {
+        if (detailed) {
+            System.out.println(String.format("Id: %s Name: %s  Active: %s Members: %s",
+                    Base64.encodeBytes(group.groupId), group.name, group.active, group.members));
+        } else {
+            System.out.println(String.format("Id: %s Name: %s  Active: %s", Base64.encodeBytes(group.groupId),
+                    group.name, group.active));
+        }
+    }
+
+    private static String formatSafetyNumber(String digits) {
+        final int partCount = 12;
+        int partSize = digits.length() / partCount;
+        StringBuilder f = new StringBuilder(digits.length() + partCount);
+        for (int i = 0; i < partCount; i++) {
+            f.append(digits.substring(i * partSize, (i * partSize) + partSize)).append(" ");
+        }
+        return f.toString();
+    }
+

     private static void handleGroupNotFoundException(GroupNotFoundException e) {
         System.err.println("Failed to send to group: " + e.getMessage());
         System.err.println("Aborting sending.");
     private static void handleGroupNotFoundException(GroupNotFoundException e) {
         System.err.println("Failed to send to group: " + e.getMessage());
         System.err.println("Aborting sending.");


@@ -635,6 +743,12 @@ public class Main {
                 .help("The verification should be done over voice, not sms.")
                 .action(Arguments.storeTrue());
 
                 .help("The verification should be done over voice, not sms.")
                 .action(Arguments.storeTrue());
 

+        Subparser parserUnregister = subparsers.addParser("unregister");
+        parserUnregister.help("Unregister the current device from the signal server.");
+
+        Subparser parserUpdateAccount = subparsers.addParser("updateAccount");
+        parserUpdateAccount.help("Update the account attributes on the signal server.");
+

         Subparser parserVerify = subparsers.addParser("verify");
         parserVerify.addArgument("verificationCode")
                 .help("The verification code you received via sms or voice call.");
         Subparser parserVerify = subparsers.addParser("verify");
         parserVerify.addArgument("verificationCode")
                 .help("The verification code you received via sms or voice call.");


@@ -669,6 +783,11 @@ public class Main {
         parserUpdateGroup.addArgument("-m", "--member")
                 .nargs("*")
                 .help("Specify one or more members to add to the group");
         parserUpdateGroup.addArgument("-m", "--member")
                 .nargs("*")
                 .help("Specify one or more members to add to the group");

+        
+        Subparser parserListGroups = subparsers.addParser("listGroups");
+        parserListGroups.addArgument("-d", "--detailed").action(Arguments.storeTrue())
+                .help("List members of each group");
+        parserListGroups.help("List group name and ids");

 
         Subparser parserListIdentities = subparsers.addParser("listIdentities");
         parserListIdentities.addArgument("-n", "--number")
 
         Subparser parserListIdentities = subparsers.addParser("listIdentities");
         parserListIdentities.addArgument("-n", "--number")


@@ -687,13 +806,19 @@ public class Main {
 
         Subparser parserReceive = subparsers.addParser("receive");
         parserReceive.addArgument("-t", "--timeout")
 
         Subparser parserReceive = subparsers.addParser("receive");
         parserReceive.addArgument("-t", "--timeout")

-                .type(int.class)
+                .type(double.class)

                 .help("Number of seconds to wait for new messages (negative values disable timeout)");
                 .help("Number of seconds to wait for new messages (negative values disable timeout)");

+        parserReceive.addArgument("--ignore-attachments")
+                .help("Don’t download attachments of received messages.")
+                .action(Arguments.storeTrue());

 
         Subparser parserDaemon = subparsers.addParser("daemon");
         parserDaemon.addArgument("--system")
                 .action(Arguments.storeTrue())
                 .help("Use DBus system bus instead of user bus.");
 
         Subparser parserDaemon = subparsers.addParser("daemon");
         parserDaemon.addArgument("--system")
                 .action(Arguments.storeTrue())
                 .help("Use DBus system bus instead of user bus.");

+        parserDaemon.addArgument("--ignore-attachments")
+                .help("Don’t download attachments of received messages.")
+                .action(Arguments.storeTrue());

 
         try {
             Namespace ns = parser.parseArgs(args);
 
         try {
             Namespace ns = parser.parseArgs(args);


@@ -775,7 +900,7 @@ public class Main {
             if (source.getRelay().isPresent()) {
                 System.out.println("Relayed by: " + source.getRelay().get());
             }
             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.");
 
             if (envelope.isReceipt()) {
                 System.out.println("Got receipt.");


@@ -813,7 +938,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("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()) {
                             }
                         }
                         if (syncMessage.getRequest().isPresent()) {


@@ -836,10 +961,21 @@ public class Main {
                             } else {
                                 to = "Unknown";
                             }
                             } 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: " + formatTimestamp(sentTranscriptMessage.getExpirationStartTimestamp()));
+                            }

                             SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
                             handleSignalServiceDataMessage(message);
                         }
                             SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
                             handleSignalServiceDataMessage(message);
                         }

+                        if (syncMessage.getBlockedList().isPresent()) {
+                            System.out.println("Received sync message with block list");
+                            System.out.println("Blocked numbers:");
+                            final BlockedListMessage blockedList = syncMessage.getBlockedList().get();
+                            for (String number : blockedList.getNumbers()) {
+                                System.out.println(" - " + number);
+                            }
+                        }

                     }
                 }
             } else {
                     }
                 }
             } else {


@@ -849,7 +985,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()) {
                 System.out.println("Body: " + message.getBody().get());
 
             if (message.getBody().isPresent()) {
                 System.out.println("Body: " + message.getBody().get());


@@ -882,6 +1018,12 @@ public class Main {
             if (message.isEndSession()) {
                 System.out.println("Is end session");
             }
             if (message.isEndSession()) {
                 System.out.println("Is end session");
             }

+            if (message.isExpirationUpdate()) {
+                System.out.println("Is Expiration update: " + message.isExpirationUpdate());
+            }
+            if (message.getExpiresInSeconds() > 0) {
+                System.out.println("Expires in: " + message.getExpiresInSeconds() + " seconds");
+            }

 
             if (message.getAttachments().isPresent()) {
                 System.out.println("Attachments: ");
 
             if (message.getAttachments().isPresent()) {
                 System.out.println("Attachments: ");


@@ -948,4 +1090,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) + ")";
+    }

 }
 }