X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/b0d7daeca202690bc9ad9a2259e910eb1f192824..474372da6b56942638b7b870eb748a0a8f269cfe:/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 a0059824..f9084516 100644
--- 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 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;
@@ -501,11 +506,12 @@ public class Main {
                         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, ns.getBoolean("detailed"));
+                        printGroup(group, detailed);
                     }
                     break;
                 case "listIdentities":
@@ -634,19 +640,18 @@ public class Main {
     }
 
     private static void printIdentityFingerprint(Manager m, String theirUsername, JsonIdentityKeyStore.Identity theirId) {
-        String digits = formatSafetyNumber(m.computeSafetyNumber(theirUsername, theirId.identityKey));
+        String digits = formatSafetyNumber(m.computeSafetyNumber(theirUsername, theirId.getIdentityKey()));
         System.out.println(String.format("%s: %s Added: %s Fingerprint: %s Safety Number: %s", theirUsername,
-                theirId.trustLevel, theirId.added, Hex.toStringCondensed(theirId.getFingerprint()), digits));
+                theirId.getTrustLevel(), theirId.getDateAdded(), Hex.toStringCondensed(theirId.getFingerprint()), digits));
     }
-    
+
     private static void printGroup(GroupInfo group, boolean detailed) {
-        System.out.println(String.format("Group id: %s\n Group name: %s \n active: %s",
-                Base64.encodeBytes(group.groupId), group.name, group.active));
         if (detailed) {
-            System.out.println(" Members:");
-            for (String member : group.members) {
-                System.out.println("  " + member);
-            }
+            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));
         }
     }
 
@@ -778,7 +783,7 @@ public class Main {
         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");