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 a0059824638d86e23742bd1be4919875a9c54aa2..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;


@@ -503,9 +508,10 @@ public class Main {
                     }
     
                     List<GroupInfo> groups = m.getGroups();
                     }
     
                     List<GroupInfo> groups = m.getGroups();

+                    boolean detailed = ns.getBoolean("detailed");

     
                     for (GroupInfo group : groups) {
     
                     for (GroupInfo group : groups) {

-                        printGroup(group, ns.getBoolean("detailed"));
+                        printGroup(group, detailed);

                     }
                     break;
                 case "listIdentities":
                     }
                     break;
                 case "listIdentities":


@@ -634,19 +640,18 @@ public class Main {
     }
 
     private static void printIdentityFingerprint(Manager m, String theirUsername, JsonIdentityKeyStore.Identity theirId) {
     }
 
     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,
         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) {
     }
     
     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) {
         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));

         }
     }
 
         }
     }